summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Parse config/resque.yml in one place onlyJacob Vosmaer2016-03-094-36/+13
* Merge branch 'remove-duplicate-cache_store-in-test-config' into 'master' Robert Speicher2016-03-081-2/+0
|\
| * Remove duplicate 'cache_store' configuration in test environmentremove-duplicate-cache_store-in-test-configRémy Coutable2016-03-021-2/+0
* | Don't generate factories automaticallyRobert Speicher2016-03-041-0/+4
* | Remove `Profile::KeysController#new` actionRobert Speicher2016-03-031-1/+1
* | Merge branch 'improve-user-tabs' into 'master' Jacob Schatz2016-03-031-0/+9
|\ \
| * \ Merge branch 'master' into improve-user-tabsAlfredo Sumaran2016-03-012-8/+10
| |\ \ | | |/
| * | Make url and actions to be the same nameAlfredo Sumaran2016-03-011-2/+2
| * | Add routes and actions for dynamic tab loadingJosh Frye2016-02-291-0/+9
* | | Merge branch 'mail-room-config-without-rails' into 'master' Douwe Maan2016-03-022-41/+50
|\ \ \ | |_|/ |/| |
| * | Don't load all of GitLab in mail_roomDouwe Maan2016-02-262-41/+50
* | | Use dedicated relative_url.rb initializerArtem Sidorenko2016-02-292-8/+10
| |/ |/|
* | Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-261-0/+13
|/
* Merge branch 'bring-back-newrelic-gem' into 'master' Rémy Coutable2016-02-241-0/+16
|\
| * Revert "Remove newrelic gem. Closes #12860"Stan Hu2016-02-231-0/+16
* | Merge branch 'issue_13301_emoji-menu' into 'master' Robert Speicher2016-02-241-0/+2
|\ \ | |/ |/|
| * Create EmojisControllerAnnabel Dunstone2016-02-221-1/+2
| * Load award emoji picker with ajax requestAnnabel Dunstone2016-02-181-0/+1
* | Properly set `auto_link_saml_user` default value in the Settings loader.Patricio Cano2016-02-221-0/+1
* | Add missing route to mark all todos as donetasksDouglas Barbosa Alexandre2016-02-211-1/+6
* | Rename Tasks to TodosDouglas Barbosa Alexandre2016-02-201-1/+1
* | Allow user to mark each task as done manuallyDouglas Barbosa Alexandre2016-02-201-1/+1
* | Add tasks queue list pageDouglas Barbosa Alexandre2016-02-201-0/+1
* | Remove code introduced when endpoint was in MR controller.Rubén Dávila2016-02-191-1/+0
* | Add new endpoint and button to revert any commit.Rubén Dávila2016-02-191-0/+1
* | Add new endpoint and button to revert merge. #3409Rubén Dávila2016-02-191-0/+1
* | Use POST method instead of DELETE when erasing a buildGrzegorz Bizon2016-02-191-1/+1
* | Change build erase path to make it consistent with APIGrzegorz Bizon2016-02-191-1/+1
* | Use DELETE verb for erasing a build contentGrzegorz Bizon2016-02-191-1/+1
* | Add build eraseable feature implementationGrzegorz Bizon2016-02-191-0/+1
* | Merge branch 'saml-decoupling' into 'master'Patricio Cano2016-02-191-2/+9
|\ \
| * | Document true/false as supported value.saml-decouplingDouwe Maan2016-02-191-2/+2
| * | Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-181-2/+9
* | | Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-191-2/+2
|\ \ \ | |/ / |/| |
| * | Update Emoji asset pathRobert Speicher2016-02-121-2/+2
| |/
* | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-181-1/+1
|\ \
| * | bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed...Richard Pidgeon2016-02-181-1/+1
| |/
* | Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-181-9/+2
* | Merge branch 'rs-sentry-release-tracking' into 'master' Douwe Maan2016-02-182-2/+3
|\ \
| * | Add release tracking for Sentryrs-sentry-release-trackingRobert Speicher2016-02-172-2/+3
| |/
* | Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-181-2/+9
|\ \
| * | Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-181-2/+9
| |/
* | Use SCAN during 'rake cache:clear'cache-clearJacob Vosmaer2016-02-181-1/+3
|/
* Move builds badge implementation to new badges controllerGrzegorz Bizon2016-02-111-2/+6
* Fix rubocop offence in routes for build badgeGrzegorz Bizon2016-02-111-1/+1
* Move badge implementation to builds controllerGrzegorz Bizon2016-02-111-8/+3
* Skip authentication when requesting commit status badgeGrzegorz Bizon2016-02-111-1/+1
* Improve CI status badge implementationGrzegorz Bizon2016-02-111-2/+2
* Add CI status badge implementation to commit controllerGrzegorz Bizon2016-02-111-0/+7
* Merge branch 'doc_relative_url' into 'master' Achilleas Pipinellis2016-02-103-16/+17
|\