summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Removed extra activity update for new projectscreate-project-performanceYorick Peterse2015-10-291-2/+0
| | | | | When a project is created the last activity timestamp is already set so there's no need for another update.
* Merge branch 'edit-new-cross-references'Dmitriy Zaporozhets2015-10-283-3/+3
|\
| * Use issue editor as cross reference comment author when issue is edited with ↵edit-new-cross-referencesDouwe Maan2015-10-283-3/+3
| | | | | | | | a new mention.
* | Remove deprecated CI events from project settings pageDmitriy Zaporozhets2015-10-285-59/+0
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #9771 from kazubu/fix_error_destroy_without_refererStan Hu2015-10-261-5/+1
|\ | | | | 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-261-1/+1
| |
* | Merge branch 'fix-ci-badge' into 'master' Robert Speicher2015-10-262-13/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-262-13/+7
| |/ | | | | | | The previous code relied on having on ref stored in commit, however the ref was moved to the build.
* | Fix specific runner visibilityKamil Trzcinski2015-10-263-14/+19
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-10-267-9/+24
|\
| * Merge branch 'dirceu/gitlab-ce-fix-project-search-with-unmatched-parentheses'Douwe Maan2015-10-251-1/+1
| |\
| | * Fix issue #3055 (project search with unmatched parentheses)dirceu/gitlab-ce-fix-project-search-with-unmatched-parenthesesDirceu Pereira Tiegs2015-10-211-1/+1
| | |
| * | Merge branch 'ci-status-mr-index' into 'master' Dmitriy Zaporozhets2015-10-256-8/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-2/+4
| | | | | | | | | | | | | | | | 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-231-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Render CI status on merge requests index pageDmitriy Zaporozhets2015-10-233-3/+13
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix some grammatical issuesJannick Fahlbusch2015-10-244-7/+6
|/ / /
* | | Add missing characterJannick Fahlbusch2015-10-231-1/+1
| | | | | | | | | This adds the missing character `a` to the help-text
* | | Merge branch 'rs-clipboard-js' into 'master' Dmitriy Zaporozhets2015-10-237-5/+62
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 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
| | |
* | | Merge branch 'git-follow' into 'master' Dmitriy Zaporozhets2015-10-231-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-2/+5
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix-ci-regressions' into 'master' Robert Speicher2015-10-2310-30/+50
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| * | 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-235-8/+13
| | |
* | | 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
| * | | Update SourceSansPro fontsupdate-fontsDmitriy Zaporozhets2015-10-2112-0/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'comments_fix' into 'master' Dmitriy Zaporozhets2015-10-232-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork https://dev.gitlab.org/gitlab/gitlabhq/issues/2535 See merge request !1675
| * | | Fix: Inability to reply to code comments in the MR view, if the MR comes ↵comments_fixValery Sizov2015-10-222-2/+2
| | | | | | | | | | | | | | | | from a fork
* | | | Merge branch 'readme-extra-padding' into 'master' Dmitriy Zaporozhets2015-10-221-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add extra padding to README block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1671
| * | | | Add extra padding to README blockDmitriy Zaporozhets2015-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'cleanup-css' into 'master' Dmitriy Zaporozhets2015-10-222-17/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve css code quality for projects.scss Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1674
| * | | | | Improve css code quality for projects.scssDmitriy Zaporozhets2015-10-222-17/+16
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'rs-issuable-filter-count-style' into 'master' Dmitriy Zaporozhets2015-10-223-5/+16
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of the filter counter for Issuables ## Before: ![Screen_Shot_2015-10-22_at_4.00.15_PM](/uploads/5f54faf3b056c1b3e2cb1b6d5c27614b/Screen_Shot_2015-10-22_at_4.00.15_PM.png) ## After: ![Screen_Shot_2015-10-22_at_3.58.04_PM](/uploads/127a90795aed7d41c053a735bbee0e3b/Screen_Shot_2015-10-22_at_3.58.04_PM.png) See merge request !1667
| * | | | Fix alignment of the filter counter for Issuablesrs-issuable-filter-count-styleRobert Speicher2015-10-223-5/+16
| | | | |
* | | | | Remove bad css styleDmitriy Zaporozhets2015-10-221-5/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'compact-file-list' into 'master' Dmitriy Zaporozhets2015-10-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make file list more compact Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1669
| * | | | | Make file list more compactcompact-file-listDmitriy Zaporozhets2015-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'project-readme-edit' into 'master' Dmitriy Zaporozhets2015-10-222-6/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore edit button in project readme Also make sure edit button can actually be clicked, like !1668. See merge request !1670
| * | | | | Restore edit button in project readmeproject-readme-editDouwe Maan2015-10-222-6/+12
| | | | | |
View Lorry Controller Status