summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Persist blob editor's value on submit, not on clickrs-editor-submitRobert Speicher2015-10-312-8/+8
* Merge branch 'optimize-user-find-by-any-email' into 'master' Yorick Peterse2015-10-301-15/+10
|\
| * Use a subquery with IDs only for find_by_any_emailYorick Peterse2015-10-301-9/+7
| * Fixed UNION syntax for MySQLYorick Peterse2015-10-301-2/+2
| * Use a UNION for User.find_by_any_emailYorick Peterse2015-10-301-3/+12
| * Improve performance of User.find_by_any_emailYorick Peterse2015-10-301-15/+3
* | Merge branch 'minor-ui-fixes' into 'master' Dmitriy Zaporozhets2015-10-303-8/+8
|\ \ | |/ |/|
| * Fix label destroy jsminor-ui-fixesDmitriy Zaporozhets2015-10-291-1/+1
| * Fix bg for labels page when no labels presentDmitriy Zaporozhets2015-10-291-3/+3
| * Put delete snippet btn after edit btnDmitriy Zaporozhets2015-10-291-4/+4
* | Merge branch 'binford2k/gitlab-ce-feature/create_new_directories'Douwe Maan2015-10-294-5/+21
|\ \
| * | Add ability to create directories in the editorBen Ford2015-10-294-5/+21
* | | Force update refs/merge-requests/X/head upon a push to the source branch of a...Stan Hu2015-10-291-1/+1
|/ /
* | 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
| |/
* | Remove deprecated CI events from project settings pageDmitriy Zaporozhets2015-10-285-59/+0
|/
* Merge pull request #9771 from kazubu/fix_error_destroy_without_refererStan Hu2015-10-261-5/+1
|\
| * 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 badgefix-ci-badgeKamil Trzcinski2015-10-262-13/+7
| |/
* | 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
| |\ \
| | * | Fix rubocop issuesci-status-mr-indexDmitriy Zaporozhets2015-10-231-2/+4
| | * | Move rendering CI status to helperDmitriy Zaporozhets2015-10-234-8/+10
| | * | Add tests for MR index pageDmitriy Zaporozhets2015-10-231-1/+2
| | * | Render CI status on merge requests index pageDmitriy Zaporozhets2015-10-233-3/+13
* | | | Fix some grammatical issuesJannick Fahlbusch2015-10-244-7/+6
|/ / /
* | | Add missing characterJannick Fahlbusch2015-10-231-1/+1
* | | Merge branch 'rs-clipboard-js' into 'master' Dmitriy Zaporozhets2015-10-237-5/+62
|\ \ \ | |/ / |/| |
| * | 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
| * | 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
|\ \ \
| * | | Refactor git follow option setgit-followDmitriy Zaporozhets2015-10-231-1/+1
| * | | Use git follow flag for commits page when retrieve history for file or directoryDmitriy Zaporozhets2015-10-231-2/+5
| |/ /
* | | Merge branch 'fix-ci-regressions' into 'master' Robert Speicher2015-10-2310-30/+50
|\ \ \ | |/ / |/| |
| * | 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 fontsupdate-fontsDmitriy Zaporozhets2015-10-2112-0/+0
* | | | Merge branch 'comments_fix' into 'master' Dmitriy Zaporozhets2015-10-232-2/+2
|\ \ \ \ | |_|/ / |/| | |