summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make sure relative url and asset_host are honored, specs.Marin Jankovski2014-10-103-3/+20
|
* Bump html-pipeline-gitlab gem versionMarin Jankovski2014-10-101-2/+4
|
* Enable markdown pipeline filters from inside gitlab.Marin Jankovski2014-10-091-8/+11
|
* Merge branch 'ruby-version' into 'master'Dmitriy Zaporozhets2014-10-091-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 automaticallyJob van der Voort2014-10-091-0/+1
| |
* | Revert "Up version of html-pipeline-gitlab."Marin Jankovski2014-10-091-3/+2
|/ | | | This reverts commit 17835f095fb10168d5d2f6b2fd4c136844c2bfd1.
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-081-1/+2
|\
| * Merge pull request #7986 from liammonahan/masterDmitriy Zaporozhets2014-10-081-1/+2
| |\ | | | | | | Correctly pluralize participants on issue show page
| | * Correctly pluralize participants on issue show page.Liam Monahan2014-10-081-1/+2
| | |
* | | Remove border radius because it has wrong backgroundDmitriy Zaporozhets2014-10-081-2/+0
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'improve-danger-zone' into 'master'Dmitriy Zaporozhets2014-10-0811-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 boxesDmitriy Zaporozhets2014-10-086-40/+33
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Improve project remove specDmitriy Zaporozhets2014-10-081-2/+6
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Apply ConfirmDangerModal for project transfer/remove actionsDmitriy Zaporozhets2014-10-083-7/+22
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | ConfirmDangerModal window added. It will be used for confirmation of ↵Dmitriy Zaporozhets2014-10-082-0/+42
| | | | | | | | | | | | | | | | | | dangerous actions Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | show danger settings by defaultDmitriy Zaporozhets2014-10-081-86/+75
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-085-7/+213
|\ \ \
| * \ \ Merge pull request #7988 from marcaube/patch-1Robert Schilling2014-10-081-1/+4
| |\ \ \ | | | | | | | | | | Import - Display message when skipping repo
| | * | | Update import.rakeMarc Aubé2014-10-071-1/+4
| | | | | | | | | | | | | | | Output a message when a repo is skipped
| * | | | Merge pull request #7545 from buildbox/buildbox-serviceDmitriy Zaporozhets2014-10-084-6/+209
| |\ \ \ \ | | |_|/ / | |/| | | Buildbox Service Integration
| | * | | Handle the case where the CI service may not provide a status_img_path method.Keith Pitt2014-10-081-2/+7
| | | | |
| | * | | Merge branch 'master' into buildbox-serviceKeith Pitt2014-10-08315-754/+1961
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb
| | * | | | Added support for BuildboxKeith Pitt2014-10-084-7/+206
| | | | | |
* | | | | | Up version of html-pipeline-gitlab.Marin Jankovski2014-10-081-2/+3
|/ / / / /
* | | | | Merge pull request #7983 from cirosantilli/factor-issue-mr-serviceDmitriy Zaporozhets2014-10-083-20/+15
|\ \ \ \ \ | | | | | | | | | | | | Factor issue and merge request services
| * | | | | Factor issue and merge request servicesCiro Santilli2014-10-073-20/+15
| | | | | |
* | | | | | Merge pull request #7938 from cirosantilli/factor-dashboard-helperDmitriy Zaporozhets2014-10-081-21/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Factor dashboard helper methods.
| * | | | | | Factor dashboard helper methods.Ciro Santilli2014-10-021-21/+12
| | | | | | |
* | | | | | | Merge pull request #7979 from mr-vinn/refactor-tasksDmitriy Zaporozhets2014-10-088-82/+61
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Refactor task list tests and coffeescript
| * | | | | | Rename coffeescript fileVinnie Okada2014-10-071-0/+0
| | | | | | |
| * | | | | | Refactor task list tests and coffeescriptVinnie Okada2014-10-068-82/+61
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-0812-21/+29
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #7981 from cirosantilli/www-to-aboutSytse Sijbrandij2014-10-088-14/+22
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Replace www.gitlab.com with about.gitlab.com
| | * | | | | | | Replace www.gitlab.com with about.gitlab.comCiro Santilli2014-10-078-14/+22
| | | | | | | | |
| * | | | | | | | Merge pull request #7992 from cirosantilli/upcate-featureRobert Schilling2014-10-082-2/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Upcase missing feature names
| | * | | | | | | | Upcase missing feature namesCiro Santilli2014-10-072-2/+2
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #7991 from cirosantilli/app-finders-readmeRobert Schilling2014-10-081-4/+4
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | Improve formatting of app/finders/README.md [failure unrelated]
| | * | | | | | | Improve formatting of app/finders/README.mdCiro Santilli2014-10-071-4/+4
| | |/ / / / / /
| * | | | | | | Merge pull request #7985 from cirosantilli/outdated-commentRobert Schilling2014-10-071-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Remove outdated comment from commits_controller
| | * | | | | | Remove outdated comment from commits_controllerCiro Santilli2014-10-071-1/+1
| | |/ / / / /
* | | | | | | Merge branch 'developer-can-push-wiki' into 'master'Dmitriy Zaporozhets2014-10-084-22/+63
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Developer can push wiki Fixes #1630 See merge request !1159
| * | | | | | Improve wiki path parsing in internal apiDmitriy Zaporozhets2014-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Developers can push to wiki repo. Protected branches does not affect wiki ↵Dmitriy Zaporozhets2014-10-074-22/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | repo any more Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'mr-widget-css' into 'master'Dmitriy Zaporozhets2014-10-074-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 boxDmitriy Zaporozhets2014-10-074-17/+50
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'gitlabflow-references' into 'master'Sytse Sijbrandij2014-10-071-0/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlabflow references See merge request !1160
| * | | | | | add references to gitlab flow articleJob van der Voort2014-10-071-0/+5
|/ / / / / /
* | | | | | Add a bit of space between star icon and textDmitriy Zaporozhets2014-10-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 't1254-snippets-refactoring' into 'master'Dmitriy Zaporozhets2014-10-077-14/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Snippets refactoring: rename public to internal. STEP 1 See merge request !1157
| * | | | | Snippets: rename public to internalValery Sizov2014-10-077-14/+14
| |/ / / /