summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix label destroy jsminor-ui-fixesDmitriy Zaporozhets2015-10-291-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix bg for labels page when no labels presentDmitriy Zaporozhets2015-10-291-3/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Put delete snippet btn after edit btnDmitriy Zaporozhets2015-10-291-4/+4
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #9771 from kazubu/fix_error_destroy_without_refererStan Hu2015-10-262-5/+2
|\ | | | | Fix: 500 error returned if destroy request without HTTP referer
| * modify to use redirect_back_or_default functionkazubu2015-10-261-5/+1
| |
| * Fix: 500 error returned if destroy request without HTTP refererkazubu2015-10-262-1/+2
| |
* | Update CHANGELOG for 8.1.1Robert Speicher2015-10-261-7/+10
| | | | | | | | [ci skip]
* | Merge branch 'fix-ci-badge' into 'master' Robert Speicher2015-10-264-15/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix CI badge The previous code relied on having on ref stored in commit, however the ref was moved to the build. Fixes #3104 See merge request !1690
| * | Fix CI badgefix-ci-badgeKamil Trzcinski2015-10-264-15/+11
| | | | | | | | | | | | The previous code relied on having on ref stored in commit, however the ref was moved to the build.
* | | Merge branch 'fix-specific-runner-visibility' into 'master' Robert Speicher2015-10-264-14/+20
|\ \ \ | |/ / |/| | | | | | | | Fix visibility of specific runners See merge request !1688
| * | Fix specific runner visibilityKamil Trzcinski2015-10-264-14/+20
| |/
* | Merge branch 'remove-satellites' into 'master' Robert Speicher2015-10-264-4/+25
|\ \ | |/ |/| | | | | Add migration to remove the contents of the satellites dir See merge request !1681
| * Remove the contents of the satellites dirremove-satellitesJacob Vosmaer2015-10-234-4/+25
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-10-2612-12/+47
|\ \
| * \ Merge branch 'dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses'Douwe Maan2015-10-253-4/+4
| |\ \
| | * | Fix issue #3055 (project search with unmatched parentheses)dirceu/gitlab-ce-fix-project-search-with-unmatched-parenthesesDirceu Pereira Tiegs2015-10-213-4/+4
| | | |
| * | | Merge branch 'ci-status-mr-index' into 'master' Dmitriy Zaporozhets2015-10-259-8/+43
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci status for merge requests index page ![ci-mr-index](/uploads/1424564c87ac6ff5fb2c4bc260fbebdf/ci-mr-index.png) See merge request !1682
| | * | | Fix rubocop issuesci-status-mr-indexDmitriy Zaporozhets2015-10-232-7/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Move rendering CI status to helperDmitriy Zaporozhets2015-10-234-8/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Add tests for MR index pageDmitriy Zaporozhets2015-10-233-1/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Render CI status on merge requests index pageDmitriy Zaporozhets2015-10-234-3/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge pull request #9769 from jannickfahlbusch/fixTyposStan Hu2015-10-264-7/+6
|\ \ \ \ \ | |/ / / / |/| | | | Fix some grammatical issues
| * | | | Fix some grammatical issuesJannick Fahlbusch2015-10-244-7/+6
| | | | |
* | | | | Merge remote-tracking branch 'github/master'Robert Speicher2015-10-241-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #9767 from jannickfahlbusch/patch-1Robert Schilling2015-10-241-1/+1
| |\ \ \ \ | | | | | | | | | | | | Add missing character
| | * | | | Add missing characterJannick Fahlbusch2015-10-231-1/+1
| |/ / / / | | | | | | | | | | This adds the missing character `a` to the help-text
* | | | | Remove "Install schedules" step from Installation guideRobert Speicher2015-10-241-5/+0
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #9765 from drobati/patch-1Stan Hu2015-10-231-1/+1
|\ \ \ \ | |_|_|/ |/| | | Added missing period in gitlab_flow article.
| * | | Added missing period.Derek Robati2015-10-231-1/+1
|/ / /
* | | Merge branch 'rs-clipboard-js' into 'master' Dmitriy Zaporozhets2015-10-238-5/+683
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Add "Copy to clipboard" buttons See #2855 See merge request !1494
| * | Remove unused argument from clipboard_button helperRobert Speicher2015-10-231-1/+1
| | |
| * | Add clipboard buttons to each step of "How to merge"Robert Speicher2015-10-232-2/+14
| | |
| * | Add "Copy to clipboard" buttonsRobert Speicher2015-10-233-3/+14
| | | | | | | | | | | | | | | Adds buttons to the commit list SHAs and the cross-project reference data on issuables.
| * | Add styling for cross-project-reference clipboard buttonRobert Speicher2015-10-231-0/+13
| | |
| * | Add copy_to_clipboard JSRobert Speicher2015-10-231-0/+21
| | |
| * | Vendor clipboard.jsRobert Speicher2015-10-231-0/+621
| | |
* | | Merge branch 'git-follow' into 'master' Dmitriy Zaporozhets2015-10-232-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use git follow flag for commits page when retrieve history for file or directory This can be really helpful when you want commit history for file that was moved recently Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1680
| * | | Refactor git follow option setgit-followDmitriy Zaporozhets2015-10-231-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Use git follow flag for commits page when retrieve history for file or directoryDmitriy Zaporozhets2015-10-232-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'fix-ci-regressions' into 'master' Robert Speicher2015-10-2313-31/+58
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI regressions This MR fixes a couple of small CI regressions - Allow developer to manage builds - On CI Admin page show only projects that are present in GitLab - On Runner CI Admin page show only projects that are present in GitLab - Refresh build log only when status changes - Show the oldest builds on top when viewing Builds - it most cases it shows running builds on top - Fix Lint rendering - Fix number of other builds in build widget Fixes #3164 Fixes #3161 Fixes gitlab-org/gitlab-ci#343 See merge request !1679
| * | | Fixed nesting for Allowed to failfix-ci-regressionsKamil Trzcinski2015-10-231-1/+1
| | | |
| * | | Fail builds that also have empty stringKamil Trzcinski2015-10-232-1/+6
| | | |
| * | | Fix broken Runners admin pageKamil Trzcinski2015-10-232-12/+19
| | | |
| * | | On CI Admin page show only projects that are present in GitLabKamil Trzcinski2015-10-231-0/+1
| | | |
| * | | Allow developer to manage buildsKamil Trzcinski2015-10-233-10/+17
| | | |
| * | | Fix small CI UI regressionsKamil Trzcinski2015-10-236-8/+15
| | | |
* | | | Merge branch 'fix-wiki-clone-over-http' into 'master' Robert Speicher2015-10-233-1/+25
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cloning Wiki repositories via HTTP Cloning a project Wiki over HTTP would end up cloning the main repository since the .wiki extension was being stripped. Closes #3106 See merge request !1676
| * | | Add spec for cloning Wiki over HTTPStan Hu2015-10-221-0/+16
| | | |
| * | | Fix cloning Wiki repositories via HTTPStan Hu2015-10-222-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cloning a project Wiki over HTTP would end up cloning the main repository since the .wiki extension was being stripped. Closes #3106
* | | | Merge branch 'update-fonts' into 'master' Dmitriy Zaporozhets2015-10-2312-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update SourceSansPro fonts Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1678