summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/ci-runners-token-persistence' into 'master' Grzegorz Bizon2015-12-233-8/+18
|\
| * Use method that creates runners registration tokenGrzegorz Bizon2015-12-233-2/+5
| * Add method that persist ensured token in `TokenAuthenticatable`Grzegorz Bizon2015-12-231-2/+13
| * Fix method that ensures authentication tokenGrzegorz Bizon2015-12-231-6/+2
* | Merge branch 'rs-update-jquery' into 'master' Dmitriy Zaporozhets2015-12-232-4/+4
|\ \
| * | Fix paths for jquery-ui assetsrs-update-jqueryRobert Speicher2015-12-222-4/+4
| |/
* | Merge branch 'improve_emoji_picker' into 'master' Dmitriy Zaporozhets2015-12-238-56/+1381
|\ \
| * | improved emoji picker styleimprove_emoji_pickerValery Sizov2015-12-222-2/+4
| * | TYPO in the commentValery Sizov2015-12-221-1/+1
| * | customize niceScrollValery Sizov2015-12-221-1/+1
| * | fix specsValery Sizov2015-12-221-2/+4
| * | emoji css refactoringValery Sizov2015-12-221-1262/+1267
| * | base implementation of emoji picker [ci skip]Valery Sizov2015-12-228-56/+1372
| |/
* | Merge branch 'fix/ci-lint' into 'master' Grzegorz Bizon2015-12-234-28/+16
|\ \ | |/ |/|
| * Make CI Lint form synchronousfix/ci-lintGrzegorz Bizon2015-12-224-28/+16
* | Merge branch 'fix_leave_project_display' into 'master' Stan Hu2015-12-222-9/+9
|\ \
| * | Fix and test leave project displayDrew Blessing2015-12-212-9/+9
* | | Merge branch 'new-group-page' into 'master' Dmitriy Zaporozhets2015-12-222-36/+46
|\ \ \
| * | | New UI for group pagenew-group-pageDmitriy Zaporozhets2015-12-222-36/+46
| | |/ | |/|
* | | Merge branch 'new-colors' into 'master' Dmitriy Zaporozhets2015-12-224-19/+21
|\ \ \ | |/ / |/| |
| * | New color for cover block backgroundDmitriy Zaporozhets2015-12-221-1/+1
| * | new colorsnew-colorsAndriy Dyadyura2015-12-211-1/+1
| * | new-colorsAndriy Dyadyura2015-12-183-19/+21
* | | 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
| | |/ / / / | |/| | | |