Commits · f013973d19b9ae145b6f642e085172f1e266d5ef · Kazuhiko Shiozaki / gitlab-ce

08 Oct, 2014 6 commits
- Handle the case where the CI service may not provide a status_img_path method. · f013973d
  Keith Pitt authored Oct 08, 2014
  
  f013973d
- Merge branch 'master' into buildbox-service · 4c7da578
  Keith Pitt authored Oct 08, 2014
```
Conflicts:
	app/models/project.rb
```
  4c7da578
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 928178de
  Dmitriy Zaporozhets authored Oct 08, 2014
  
  928178de
- Added support for Buildbox · 76594d47
  Keith Pitt authored Aug 18, 2014
  
  76594d47
- Merge branch 'developer-can-push-wiki' into 'master' · 3b6f8309
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Developer can push wiki

Fixes #1630

See merge request !1159
```
  3b6f8309
- Merge pull request #7981 from cirosantilli/www-to-about · 3fff9aa3
  Sytse Sijbrandij authored Oct 08, 2014
```
Replace www.gitlab.com with about.gitlab.com
```
  3fff9aa3
07 Oct, 2014 21 commits
- Merge pull request #7992 from cirosantilli/upcate-feature · f2567379
  Robert Schilling authored Oct 08, 2014
```
Upcase missing feature names
```
  f2567379
- Merge pull request #7991 from cirosantilli/app-finders-readme · 9e0a7ecb
  Robert Schilling authored Oct 08, 2014
```
Improve formatting of app/finders/README.md [failure unrelated]
```
  9e0a7ecb
- Upcase missing feature names · 901d099c
  Ciro Santilli authored Oct 07, 2014
  
  901d099c
- Improve formatting of app/finders/README.md · 79840657
  Ciro Santilli authored Oct 07, 2014
  
  79840657
- Merge pull request #7985 from cirosantilli/outdated-comment · e95a8e15
  Robert Schilling authored Oct 07, 2014
```
Remove outdated comment from commits_controller
```
  e95a8e15
- Remove outdated comment from commits_controller · ceaebe23
  Ciro Santilli authored Oct 07, 2014
  
  ceaebe23
- Improve wiki path parsing in internal api · 06c91aa2
  Dmitriy Zaporozhets authored Oct 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  06c91aa2
- Merge branch 'mr-widget-css' into 'master' · 51ed8b7e
  Dmitriy Zaporozhets authored Oct 07, 2014
```
Style merge request CI widget to match MR/Issue box

![Screenshot 2014-10-07 15.13.12](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/7208a92094/Screenshot_2014-10-07_15.13.12.png)

![Screenshot 2014-10-07 15.13.25](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/f04d8d3f7b/Screenshot_2014-10-07_15.13.25.png)

See merge request !1158
```
  51ed8b7e
- Merge branch 'gitlabflow-references' into 'master' · dd005ca4
  Sytse Sijbrandij authored Oct 07, 2014
```
Gitlabflow references

See merge request !1160
```
  dd005ca4
- add references to gitlab flow article · 3386a82d
  Job van der Voort authored Oct 07, 2014
  
  3386a82d
- Developers can push to wiki repo. Protected branches does not affect wiki repo any more · 0bf99f65
  Dmitriy Zaporozhets authored Oct 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  0bf99f65
- Add a bit of space between star icon and text · 8fad7e63
  Dmitriy Zaporozhets authored Oct 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8fad7e63
- Style merge request CI widget to match MR/Issue box · 593a1b3b
  Dmitriy Zaporozhets authored Oct 07, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  593a1b3b
- Replace www.gitlab.com with about.gitlab.com · 7dcbf350
  Ciro Santilli authored Oct 07, 2014
  
  7dcbf350
- Merge branch 't1254-snippets-refactoring' into 'master' · c0306f78
  Dmitriy Zaporozhets authored Oct 07, 2014
```
Snippets refactoring: rename public to internal. STEP 1

See merge request !1157
```
  c0306f78
- Use double quotes because we are inserting password now. · bbc52b00
  Marin Jankovski authored Oct 07, 2014
  
  bbc52b00
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 0fd06adf
  Marin Jankovski authored Oct 07, 2014
  
  0fd06adf
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 90cb56f0
  Marin Jankovski authored Oct 07, 2014
  
  90cb56f0
- Merge branch 'remove-annoying-i18n-deprecation' into 'master' · 70776c71
  Marin Jankovski authored Oct 07, 2014
```
Remove annoying i18n deprecation

Thanks to this guy http://stackoverflow.com/a/20381730

Fixes #527

See merge request !197
```
  70776c71
- Merge pull request #7963 from cirosantilli/factor-previewable · 7bcd6f79
  Dmitriy Zaporozhets authored Oct 07, 2014
```
Factor markup? || gitlab_markdown? into new method
```
  7bcd6f79
- Snippets: rename public to internal · fd8d1d9b
  Valery Sizov authored Oct 07, 2014
  
  fd8d1d9b
06 Oct, 2014 13 commits
- Merge pull request #7975 from bbodenmiller/patch-4 · d790b2cb
  Robert Schilling authored Oct 06, 2014
```
webbrowsers -> web browsers
```
  d790b2cb
- Merge pull request #7974 from bbodenmiller/patch-2 · 9f3e7633
  Robert Schilling authored Oct 06, 2014
```
number formatting fix
```
  9f3e7633
- webbrowsers -> web browsers · 014eeb2e
  Ben Bodenmiller authored Oct 06, 2014
  
  014eeb2e
- number formatting fix · 897d69d6
  Ben Bodenmiller authored Oct 06, 2014
  
  897d69d6
- Merge branch 'slack_integration' into 'master' · 70004f4e
  Dmitriy Zaporozhets authored Oct 06, 2014
```
Slack integration

See merge request !1151
```
  70004f4e
- Merge pull request #7964 from mr-vinn/task-lists · 0fed1b58
  Marin Jankovski authored Oct 06, 2014
```
Add task lists to issues and merge requests
```
  0fed1b58
- Add slack service migration. · eceef546
  Marin Jankovski authored Oct 06, 2014
  
  eceef546
- Merge branch 'raise-on-forgery' into 'master' · 0c291f35
  Dmitriy Zaporozhets authored Oct 06, 2014
```
Raise on forgery

Fixes #1572

See merge request !1156
```
  0c291f35
- Preventing some duplication in MR feature tests by adding a different comment. · 9535ce2c
  Marin Jankovski authored Oct 06, 2014
  
  9535ce2c
- Protect from forgery with exception · f815115d
  Dmitriy Zaporozhets authored Oct 06, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f815115d
- Merge branch 'improve-autolink' into 'master' · 270efdf2
  Dmitriy Zaporozhets authored Oct 06, 2014
```
Improve autolink

Fixes #1649

See merge request !1155
```
  270efdf2
- Merge branch 'fix-exception-sidekiq' into 'master' · 48377711
  Dmitriy Zaporozhets authored Oct 06, 2014
```
Prevent PG::Error exception

Prevent PG::Error exception when check commit reference on commit

Fix #1646

See merge request !1154
```
  48377711
- Use only escaped auto_link · 29911494
  Dmitriy Zaporozhets authored Oct 06, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  29911494