summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Deprecate GitLabCiService making it to always be inactiveKamil Trzcinski2015-12-221-1/+6
* ci_build_details_path should return nil if builds_page result is nilKamil Trzcinski2015-12-221-0/+2
* removes api credentials from link to build_pageMarvin Frick2015-12-221-1/+8
* Merge branch 'admin_add_identity' into 'master' Robert Speicher2015-12-213-1/+21
|\
| * Allow admin to create new user identitiesDrew Blessing2015-12-153-1/+21
* | Merge branch 'fix-issue-related-mrs' into 'master' Robert Speicher2015-12-212-2/+2
|\ \
| * | Fix issue related cross-project MRsfix-issue-related-mrsDouwe Maan2015-12-212-2/+2
* | | Merge branch 'add_email_unlock' into 'master' Robert Speicher2015-12-215-19/+25
|\ \ \
| * | | Allow account unlock via emailDrew Blessing2015-12-145-19/+25
* | | | Merge branch 'issue_3452'Douwe Maan2015-12-212-0/+14
|\ \ \ \
| * | | | Add link to MR from Build detail page. #3452Rubén Dávila2015-12-162-0/+14
* | | | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-212-1/+30
|\ \ \ \ \
| * | | | | add CAS authentication supporttduehr2015-12-142-1/+30
| | |_|_|/ | |/| | |
* | | | | Merge branch 'git-version' into 'master' Douwe Maan2015-12-211-0/+4
|\ \ \ \ \
| * | | | | Show git version on admin pageTrey Davis2015-12-151-0/+4
| |/ / / /
* | | | | Merge branch 'coverage-regex' into 'master' Douwe Maan2015-12-211-1/+2
|\ \ \ \ \
| * | | | | Fix build coverage regex.Jared Szechy2015-12-201-1/+2
| * | | | | Fix build coverage regex matching to allow captures.Jared Szechy2015-12-171-1/+1
* | | | | | Backport JIRA serviceDrew Blessing2015-12-187-6/+266
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'ci-commit-status-skipped' into 'master' Grzegorz Bizon2015-12-184-14/+18
|\ \ \ \ \
| * | | | | Don't create CI status for refs that doesn't have .gitlab-ci.yml, even if the...Kamil Trzcinski2015-12-174-14/+18
| |/ / / /
* | | | | Merge branch 'reference_clean_up' into 'master' Robert Speicher2015-12-181-3/+4
|\ \ \ \ \
| * | | | | Do not display project group/name when issue and MR are in same projectDrew Blessing2015-12-171-3/+4
| |/ / / /
* | | | | Merge branch 'remove-extra-spaces' into 'master' Robert Speicher2015-12-181-8/+4
|\ \ \ \ \
| * | | | | Remove extra spaces after branchnameZeger-Jan van de Weg2015-12-181-8/+4
* | | | | | Merge branch 'fix/mr-reopen-button-title' into 'master' Grzegorz Bizon2015-12-181-3/+3
|\ \ \ \ \ \
| * | | | | | Fix merge-request-reopen button titlefix/mr-reopen-button-titleGrzegorz Bizon2015-12-181-3/+3
| | |/ / / / | |/| | | |
* | | | | | Add branch and tag operation to tree dropdownDrew Blessing2015-12-171-2/+10
|/ / / / /
* | | | | Revert sidebar position for issue and merge requestDmitriy Zaporozhets2015-12-178-108/+93
* | | | | Fix ux issue with "This issue will be closed automatically" messageux/closed-messageDmitriy Zaporozhets2015-12-174-9/+4
|/ / / /
* | | | Merge branch 'move-mr-builds-tab' into 'master' Dmitriy Zaporozhets2015-12-162-11/+11
|\ \ \ \
| * | | | Move MR Builds tab next to CommitsDouwe Maan2015-12-162-11/+11
* | | | | Fix merge widget JS for buttonsfix-merge-immediately-buttonDouwe Maan2015-12-161-10/+8
* | | | | Merge branch 'master' into fix-merge-immediately-buttonDouwe Maan2015-12-163-22/+25
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-161-4/+4
| |\ \ \ \
| | * \ \ \ Merge branch 'mr-builds-fixes' into 'master' Dmitriy Zaporozhets2015-12-161-4/+4
| | |\ \ \ \
| | | * | | | Link to correct (source) project on MR builds tabmr-builds-fixesDouwe Maan2015-12-161-4/+4
| * | | | | | Merge remote-tracking branch 'origin/rs-simplify-status-icon'Dmitriy Zaporozhets2015-12-162-18/+21
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Define CI status icon colors in SCSS instead of a helperrs-simplify-status-iconRobert Speicher2015-12-122-18/+21
* | | | | | | Fix updating and disabling merge button when Merge Immediately is clickedDouwe Maan2015-12-161-4/+4
|/ / / / / /
* | | | | | Merge branch 'fix-milestone-snippet-header' into 'master' Dmitriy Zaporozhets2015-12-1616-172/+176
|\ \ \ \ \ \
| * | | | | | Rename .issuable-details to .detail-page (and -header and -description)Douwe Maan2015-12-1616-179/+179
| * | | | | | Merge branch 'master' into fix-milestone-snippet-headerDouwe Maan2015-12-1635-97/+103
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Move milestone edit button to the very rightDouwe Maan2015-12-151-4/+4
| * | | | | | Fix headers of milestone and snippet show pagesDouwe Maan2015-12-154-12/+16
* | | | | | | Merge branch 'reference-cache' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Only cache markdown when object has been saved and has a proper cache_key.Douwe Maan2015-12-161-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix-merge-immediately' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix 'Merge Immediately' buttonfix-merge-immediatelyDouwe Maan2015-12-161-1/+1
| |/ / / / /
* | | | | | Merge branch 'fix-bad-merge' into 'master' Douwe Maan2015-12-161-1/+0
|\ \ \ \ \ \