summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use method that creates runners registration tokenfix/ci-runners-token-persistenceGrzegorz Bizon2015-12-235-4/+7
* Add method that persist ensured token in `TokenAuthenticatable`Grzegorz Bizon2015-12-232-8/+26
* Fix method that ensures authentication tokenGrzegorz Bizon2015-12-232-6/+6
* Merge branch 'fix_leave_project_display' into 'master' Stan Hu2015-12-224-9/+33
|\
| * Fix and test leave project displayDrew Blessing2015-12-214-9/+33
* | Merge branch 'new-group-page' into 'master' Dmitriy Zaporozhets2015-12-224-37/+48
|\ \
| * | New UI for group pagenew-group-pageDmitriy Zaporozhets2015-12-223-36/+47
| * | Bump versionDmitriy Zaporozhets2015-12-221-1/+1
* | | Merge branch 'hotfix/sidekiq-cron-config' into 'master' Douwe Maan2015-12-222-2/+6
|\ \ \
| * | | Hotfix for sidekiq-cron being loaded from Settingslogic with defaultsGabriel Mazetto2015-12-222-2/+6
|/ / /
* | | 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
* | | | Merge branch 'feature/sidekiq-cron-config' into 'master' Dmitriy Zaporozhets2015-12-224-15/+20
|\ \ \ \ | |_|/ / |/| | |
| * | | Sidekiq-cron configuration moved to gitlab.ymlfeature/sidekiq-cron-configGabriel Mazetto2015-12-144-15/+20
* | | | Merge branch 'fix-mr-500' into 'master' Robert Speicher2015-12-224-2/+38
|\ \ \ \
| * | | | Move `ci_build_details_path` helper spec to correct locationRobert Speicher2015-12-212-22/+20
| * | | | Update CHANGELOGfix-mr-500Kamil Trzcinski2015-12-221-0/+2
| * | | | 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-222-1/+30
* | | | | Merge branch 'rs-bump-nokogiri' into 'master' Robert Speicher2015-12-222-1/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Explicitly require Nokogiri 1.6.7.1 due to security issuers-bump-nokogiriRobert Speicher2015-12-182-1/+5
* | | | | Add 8.4.0 to CHANGELOGRobert Speicher2015-12-211-2/+3
* | | | | Merge branch 'contributing-grabs-fix' into 'master' Robert Speicher2015-12-211-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fixed wrong URL to "up for grabs" issue filterLaurens Stötzel2015-12-211-1/+1
* | | | | Merge branch 'admin_add_identity' into 'master' Robert Speicher2015-12-214-2/+22
|\ \ \ \ \
| * | | | | Allow admin to create new user identitiesDrew Blessing2015-12-154-2/+22
* | | | | | 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-2110-21/+35
|\ \ \ \ \ \
| * | | | | | Allow account unlock via emailDrew Blessing2015-12-1410-21/+35
* | | | | | | Merge branch 'issue_3452'Douwe Maan2015-12-214-0/+79
|\ \ \ \ \ \ \
| * | | | | | | Add changelog itemDouwe Maan2015-12-211-0/+1
| * | | | | | | Fix Rubocop complain.issue_3452Rubén Dávila2015-12-161-1/+1
| * | | | | | | Fix broken spec. #3452Rubén Dávila2015-12-161-1/+1
| * | | | | | | Add link to MR from Build detail page. #3452Rubén Dávila2015-12-163-0/+78
* | | | | | | | Move changelog itemDouwe Maan2015-12-211-1/+1
* | | | | | | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-2111-1/+144
|\ \ \ \ \ \ \ \
| * | | | | | | | Add link to CAS docDouwe Maan2015-12-212-3/+4
| * | | | | | | | add CAS authentication supporttduehr2015-12-1410-1/+143
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'git-version' into 'master' Douwe Maan2015-12-213-0/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | Show git version on admin pageTrey Davis2015-12-153-0/+10
| |/ / / / / / /
* | | | | | | | Merge branch 'coverage-regex' into 'master' Douwe Maan2015-12-212-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix build coverage regex.Jared Szechy2015-12-202-1/+8
| * | | | | | | | Fix build coverage regex matching to allow captures.Jared Szechy2015-12-171-1/+1
* | | | | | | | | Merge branch 'backport_jira' into 'master' Dmitriy Zaporozhets2015-12-2131-20/+875
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Backport JIRA serviceDrew Blessing2015-12-1831-20/+875
* | | | | | | | | Merge branch 'removeNonDefinedVariableFromCIDoc' into 'master' Achilleas Pipinellis2015-12-191-2/+0
|\ \ \ \ \ \ \ \ \