Commits · fba6141746821261287be0f4332814697f99e5ae · Jérome Perrin / gitlab-ce

12 Oct, 2014 4 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · fba61417
  Dmitriy Zaporozhets authored Oct 12, 2014
  
  fba61417
- Merge branch 'enabling_markdown_pipelines_from_gitlab' into 'master' · b09fd233
  Dmitriy Zaporozhets authored Oct 12, 2014
```
Enabling markdown pipelines from gitlab

Define which markdown pipelines are used in GitLab from application instead from gem.

See merge request !1164
```
  b09fd233
- Merge pull request #7915 from bbodenmiller/patch-12 · c9c6f77e
  Sytse Sijbrandij authored Oct 12, 2014
```
improve wording on protected branches page
```
  c9c6f77e
- improve wording on protected branches page · ab64ca7a
  Ben Bodenmiller authored Oct 12, 2014
  
  ab64ca7a
10 Oct, 2014 8 commits
- Make sure relative url and asset_host are honored, specs. · 2ea166fc
  Marin Jankovski authored Oct 10, 2014
  
  2ea166fc
- Add more stuff to changelog · f7342ce5
  Dmitriy Zaporozhets authored Oct 10, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f7342ce5
- Bump html-pipeline-gitlab gem version · 4149fc24
  Marin Jankovski authored Oct 10, 2014
  
  4149fc24
- Merge branch 'ssl_ciphers' into 'master' · 9c824888
  Dmitriy Zaporozhets authored Oct 10, 2014
```
Ssl ciphers update

See merge request !1168
```
  9c824888
- Add a comment on why we are using backward compatible ciphers. · be14c7a8
  Marin Jankovski authored Oct 10, 2014
  
  be14c7a8
- Revert "update ssl_ciphers" · 8ddb2be6
  Marin Jankovski authored Oct 10, 2014
```
This reverts commit c41e5f50.
```
  8ddb2be6
- Merge pull request #8004 from mr-vinn/rm-task-method · 488081cd
  Marin Jankovski authored Oct 10, 2014
```
Remove unused method
```
  488081cd
- Remove unused method · 85f1e8b8
  Vinnie Okada authored Oct 09, 2014
  
  85f1e8b8
09 Oct, 2014 10 commits
- Merge branch 'annotate' into 'master' · d59192f8
  Dmitriy Zaporozhets authored Oct 09, 2014
```
Annotate

See merge request !1167
```
  d59192f8
- annotate · 82c938ad
  Valery Sizov authored Oct 09, 2014
  
  82c938ad
- Merge branch 't1254-snippets-refactoring' into 'master' · 6303d003
  Dmitriy Zaporozhets authored Oct 09, 2014
```
Snippets need to be either public/internal/private

See merge request !1162
```
  6303d003
- Merge branch 'bump-grit' into 'master' · 2bfc2f80
  Dmitriy Zaporozhets authored Oct 09, 2014
```
Bump grit

Fixes gitlab/grit#7

See merge request !1166
```
  2bfc2f80
- Snippets: public/internal/private · 47f539f5
  Valery Sizov authored Oct 08, 2014
  
  47f539f5
- Bump gitlab-grit version with improved timeout feature · d567dd33
  Dmitriy Zaporozhets authored Oct 09, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  d567dd33
- Enable markdown pipeline filters from inside gitlab. · b4828f4c
  Marin Jankovski authored Oct 09, 2014
  
  b4828f4c
- Merge branch 'ruby-version' into 'master' · 2fb99c79
  Dmitriy Zaporozhets authored Oct 09, 2014
```
Ruby version

I set it to the latest ruby stable version, that in my experience works without issues.

/cc @jw

See merge request !1163
```
  2fb99c79
- Revert "Up version of html-pipeline-gitlab." · f7dc15c6
  Marin Jankovski authored Oct 09, 2014
```
This reverts commit 17835f09.
```
  f7dc15c6
- set the development ruby version automatically · deffd2e5
  Job van der Voort authored Oct 09, 2014
  
  deffd2e5
08 Oct, 2014 18 commits
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · d9aa3f92
  Dmitriy Zaporozhets authored Oct 08, 2014
  
  d9aa3f92
- Remove border radius because it has wrong background · 629bd283
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  629bd283
- Merge pull request #7986 from liammonahan/master · a1e2fb84
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Correctly pluralize participants on issue show page
```
  a1e2fb84
- Merge branch 'improve-danger-zone' into 'master' · 21e9ed2e
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Improve danger zone

* show transfer/remove boxes by default
* ask person to type project name before transfer/remove

Fixes #1347

See merge request !1161
```
  21e9ed2e
- Correctly pluralize participants on issue show page. · 48bc9e36
  Liam Monahan authored Oct 07, 2014
  
  48bc9e36
- Restyle colorful panel boxes · ab68fd22
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ab68fd22
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 80f9b758
  Dmitriy Zaporozhets authored Oct 08, 2014
  
  80f9b758
- Improve project remove spec · b485fdb5
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  b485fdb5
- Up version of html-pipeline-gitlab. · 17835f09
  Marin Jankovski authored Oct 08, 2014
  
  17835f09
- Apply ConfirmDangerModal for project transfer/remove actions · 74217f75
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  74217f75
- ConfirmDangerModal window added. It will be used for confirmation of dangerous actions · 9021debf
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9021debf
- Merge pull request #7988 from marcaube/patch-1 · e1123e08
  Robert Schilling authored Oct 08, 2014
```
Import - Display message when skipping repo
```
  e1123e08
- Merge pull request #7545 from buildbox/buildbox-service · b694bf6f
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Buildbox Service Integration
```
  b694bf6f
- Handle the case where the CI service may not provide a status_img_path method. · f013973d
  Keith Pitt authored Oct 08, 2014
  
  f013973d
- show danger settings by default · e8a82603
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e8a82603
- Merge pull request #7983 from cirosantilli/factor-issue-mr-service · d30e1f5c
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Factor issue and merge request services
```
  d30e1f5c
- Merge pull request #7938 from cirosantilli/factor-dashboard-helper · ac7fab73
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Factor dashboard helper methods.
```
  ac7fab73
- Merge pull request #7979 from mr-vinn/refactor-tasks · cf1aa36a
  Dmitriy Zaporozhets authored Oct 08, 2014
```
Refactor task list tests and coffeescript
```
  cf1aa36a