Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make sure relative url and asset_host are honored, specs. | Marin Jankovski | 2014-10-10 | 3 | -3/+20 |
| | |||||
* | Bump html-pipeline-gitlab gem version | Marin Jankovski | 2014-10-10 | 1 | -2/+4 |
| | |||||
* | Enable markdown pipeline filters from inside gitlab. | Marin Jankovski | 2014-10-09 | 1 | -8/+11 |
| | |||||
* | Merge branch 'ruby-version' into 'master' | Dmitriy Zaporozhets | 2014-10-09 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | | | Ruby version I set it to the latest ruby stable version, that in my experience works without issues. /cc @jw See merge request !1163 | ||||
| * | set the development ruby version automatically | Job van der Voort | 2014-10-09 | 1 | -0/+1 |
| | | |||||
* | | Revert "Up version of html-pipeline-gitlab." | Marin Jankovski | 2014-10-09 | 1 | -3/+2 |
|/ | | | | This reverts commit 17835f095fb10168d5d2f6b2fd4c136844c2bfd1. | ||||
* | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-10-08 | 1 | -1/+2 |
|\ | |||||
| * | Merge pull request #7986 from liammonahan/master | Dmitriy Zaporozhets | 2014-10-08 | 1 | -1/+2 |
| |\ | | | | | | | Correctly pluralize participants on issue show page | ||||
| | * | Correctly pluralize participants on issue show page. | Liam Monahan | 2014-10-08 | 1 | -1/+2 |
| | | | |||||
* | | | Remove border radius because it has wrong background | Dmitriy Zaporozhets | 2014-10-08 | 1 | -2/+0 |
|/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | Merge branch 'improve-danger-zone' into 'master' | Dmitriy Zaporozhets | 2014-10-08 | 11 | -113/+156 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve danger zone * show transfer/remove boxes by default * ask person to type project name before transfer/remove Fixes #1347 See merge request !1161 | ||||
| * | | Restyle colorful panel boxes | Dmitriy Zaporozhets | 2014-10-08 | 6 | -40/+33 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Improve project remove spec | Dmitriy Zaporozhets | 2014-10-08 | 1 | -2/+6 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Apply ConfirmDangerModal for project transfer/remove actions | Dmitriy Zaporozhets | 2014-10-08 | 3 | -7/+22 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | ConfirmDangerModal window added. It will be used for confirmation of ↵ | Dmitriy Zaporozhets | 2014-10-08 | 2 | -0/+42 |
| | | | | | | | | | | | | | | | | | | dangerous actions Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | show danger settings by default | Dmitriy Zaporozhets | 2014-10-08 | 1 | -86/+75 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-10-08 | 5 | -7/+213 |
|\ \ \ | |||||
| * \ \ | Merge pull request #7988 from marcaube/patch-1 | Robert Schilling | 2014-10-08 | 1 | -1/+4 |
| |\ \ \ | | | | | | | | | | | Import - Display message when skipping repo | ||||
| | * | | | Update import.rake | Marc Aubé | 2014-10-07 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | Output a message when a repo is skipped | ||||
| * | | | | Merge pull request #7545 from buildbox/buildbox-service | Dmitriy Zaporozhets | 2014-10-08 | 4 | -6/+209 |
| |\ \ \ \ | | |_|/ / | |/| | | | Buildbox Service Integration | ||||
| | * | | | Handle the case where the CI service may not provide a status_img_path method. | Keith Pitt | 2014-10-08 | 1 | -2/+7 |
| | | | | | |||||
| | * | | | Merge branch 'master' into buildbox-service | Keith Pitt | 2014-10-08 | 315 | -754/+1961 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb | ||||
| | * | | | | Added support for Buildbox | Keith Pitt | 2014-10-08 | 4 | -7/+206 |
| | | | | | | |||||
* | | | | | | Up version of html-pipeline-gitlab. | Marin Jankovski | 2014-10-08 | 1 | -2/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #7983 from cirosantilli/factor-issue-mr-service | Dmitriy Zaporozhets | 2014-10-08 | 3 | -20/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | Factor issue and merge request services | ||||
| * | | | | | Factor issue and merge request services | Ciro Santilli | 2014-10-07 | 3 | -20/+15 |
| | | | | | | |||||
* | | | | | | Merge pull request #7938 from cirosantilli/factor-dashboard-helper | Dmitriy Zaporozhets | 2014-10-08 | 1 | -21/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Factor dashboard helper methods. | ||||
| * | | | | | | Factor dashboard helper methods. | Ciro Santilli | 2014-10-02 | 1 | -21/+12 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7979 from mr-vinn/refactor-tasks | Dmitriy Zaporozhets | 2014-10-08 | 8 | -82/+61 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Refactor task list tests and coffeescript | ||||
| * | | | | | | Rename coffeescript file | Vinnie Okada | 2014-10-07 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | Refactor task list tests and coffeescript | Vinnie Okada | 2014-10-06 | 8 | -82/+61 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-10-08 | 12 | -21/+29 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge pull request #7981 from cirosantilli/www-to-about | Sytse Sijbrandij | 2014-10-08 | 8 | -14/+22 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Replace www.gitlab.com with about.gitlab.com | ||||
| | * | | | | | | | Replace www.gitlab.com with about.gitlab.com | Ciro Santilli | 2014-10-07 | 8 | -14/+22 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #7992 from cirosantilli/upcate-feature | Robert Schilling | 2014-10-08 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Upcase missing feature names | ||||
| | * | | | | | | | | Upcase missing feature names | Ciro Santilli | 2014-10-07 | 2 | -2/+2 |
| | | |_|_|/ / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #7991 from cirosantilli/app-finders-readme | Robert Schilling | 2014-10-08 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | Improve formatting of app/finders/README.md [failure unrelated] | ||||
| | * | | | | | | | Improve formatting of app/finders/README.md | Ciro Santilli | 2014-10-07 | 1 | -4/+4 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge pull request #7985 from cirosantilli/outdated-comment | Robert Schilling | 2014-10-07 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Remove outdated comment from commits_controller | ||||
| | * | | | | | | Remove outdated comment from commits_controller | Ciro Santilli | 2014-10-07 | 1 | -1/+1 |
| | |/ / / / / | |||||
* | | | | | | | Merge branch 'developer-can-push-wiki' into 'master' | Dmitriy Zaporozhets | 2014-10-08 | 4 | -22/+63 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Developer can push wiki Fixes #1630 See merge request !1159 | ||||
| * | | | | | | Improve wiki path parsing in internal api | Dmitriy Zaporozhets | 2014-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | | Developers can push to wiki repo. Protected branches does not affect wiki ↵ | Dmitriy Zaporozhets | 2014-10-07 | 4 | -22/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repo any more Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | Merge branch 'mr-widget-css' into 'master' | Dmitriy Zaporozhets | 2014-10-07 | 4 | -17/+50 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | Style merge request CI widget to match MR/Issue box | Dmitriy Zaporozhets | 2014-10-07 | 4 | -17/+50 |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | Merge branch 'gitlabflow-references' into 'master' | Sytse Sijbrandij | 2014-10-07 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlabflow references See merge request !1160 | ||||
| * | | | | | | add references to gitlab flow article | Job van der Voort | 2014-10-07 | 1 | -0/+5 |
|/ / / / / / | |||||
* | | | | | | Add a bit of space between star icon and text | Dmitriy Zaporozhets | 2014-10-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | Merge branch 't1254-snippets-refactoring' into 'master' | Dmitriy Zaporozhets | 2014-10-07 | 7 | -14/+14 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Snippets refactoring: rename public to internal. STEP 1 See merge request !1157 | ||||
| * | | | | | Snippets: rename public to internal | Valery Sizov | 2014-10-07 | 7 | -14/+14 |
| |/ / / / |