summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* WIP: This makes the default sort order for branches 'recently updated' ↵26890-sort-branchesMatt Lee2017-01-201-1/+1
| | | | rather than by name.
* Merge branch 'dont-persist-application-settings-in-test-env' into 'master' Robert Speicher2017-01-2012-104/+141
|\ | | | | | | | | Don't persist application settings in test env See merge request !8573
| * Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-envRémy Coutable2017-01-1511-36/+97
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Move default values to ApplicationSetting::DEFAULTS and use it in ↵Rémy Coutable2017-01-152-69/+45
| | | | | | | | | | | | CurrentSettings Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'record-used-ssh-keys-once-per-day' into 'master' Yorick Peterse2017-01-203-5/+33
|\ \ | | | | | | | | | | | | | | | | | | Record used SSH keys only once per day Closes #26877 See merge request !8655
| * | Record used SSH keys only once per dayrecord-used-ssh-keys-once-per-dayAdam Niedzielski2017-01-203-5/+33
| | | | | | | | | | | | | | | Use Gitlab::ExclusiveLease to make sure that we enqueue Sidekiq job at most once per day for given key.
* | | Merge branch 'workhorse-v1.3.0' into 'master' 26423-organize-labels-by-color-in-the-labels-pageRémy Coutable2017-01-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Use Workhorse v1.3.0 See merge request !8660
| * | | Use Workhorse v1.3.0Nick Thomas2017-01-201-1/+1
| | | |
* | | | Merge branch '25851-document-token-scopes' into 'master' Rémy Coutable2017-01-202-3/+13
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add documentation around OAuth/Personal Access Token scopes. Closes #25851 See merge request !8226
| * | | Add documentation around OAuth/Personal Access Token scopes.Timothy Andrew2017-01-192-3/+13
| | | |
* | | | Merge branch 'rs-empty_project' into 'master' 26785-search-bar-doesnt-work-IERémy Coutable2017-01-204-131/+125
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use `:empty_project` in Project, User, MergeRequest, and MoveToProjectFinder specs See merge request !8648
| * | | | Convert MoveToProjectFinder specs to use `:empty_project`Robert Speicher2017-01-191-10/+10
| | | | |
| * | | | Convert most MergeRequest model specs to use `:empty_project`Robert Speicher2017-01-191-22/+22
| | | | |
| * | | | Convert most User model specs to use `:empty_project`Robert Speicher2017-01-191-45/+39
| | | | |
| * | | | Convert most Project model specs to use `:empty_project`Robert Speicher2017-01-191-54/+54
| | | | |
* | | | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-2020-45/+71
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380
| * | | | Renamed a file to make the transition to EE easierJose Ivan Vargas2017-01-192-2/+2
| | | | |
| * | | | Fixed tests and a rubocop linter26138-combine-webhooks-and-services-settings-pagesJose Ivan Vargas2017-01-184-10/+8
| | | | |
| * | | | Removed the index action from both the projects hook and services controllersJose Ivan Vargas2017-01-182-9/+2
| | | | |
| * | | | Corrected code style and titlesJose Ivan Vargas2017-01-185-6/+5
| | | | |
| * | | | Fixed more testsJose Ivan Vargas2017-01-183-8/+8
| | | | |
| * | | | Fixed spinach feature tests for the services and hooks controllersJose Ivan Vargas2017-01-186-8/+27
| | | | | | | | | | | | | | | | | | | | Added a test for the integrations controller
| * | | | Moved the webhooks and services gear options to a single one called integrationsJose Ivan Vargas2017-01-189-15/+32
| | | | |
* | | | | Merge branch '21698-redis-runner-last-build' into 'master' Kamil Trzciński2017-01-2011-7/+175
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reduce DB-load for build-queues by storing last_update in Redis See merge request !8084
| * | | | | Fix specsKamil Trzcinski2017-01-201-4/+6
| | | | | |
| * | | | | Fix specsKamil Trzcinski2017-01-192-2/+3
| | | | | |
| * | | | | Added CHANGELOGKamil Trzcinski2017-01-191-0/+4
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-19323-1542/+2883
| |\ \ \ \ \
| * | | | | | Fix specsKamil Trzcinski2017-01-194-10/+39
| | | | | | |
| * | | | | | Add missing build_specKamil Trzcinski2017-01-191-0/+10
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-buildKamil Trzcinski2017-01-192128-16907/+67314
| |\ \ \ \ \ \
| * | | | | | | WIP: Add tests and make sure that headers are set21698-redis-runner-last-buildLin Jen-Shin2017-01-045-5/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * We realized that headers were not set whenever we give 204 because `render_api_error!` doesn't preserve the headers. * We also realized that `update_runner_info` would be called in POST /builds/register every time therefore runner is updated every time, ticking the queue, making this last_update didn't work very well, and the test would be failing due to that.
| * | | | | | | Fixed broken buildKim "BKC" Carlbäcker2016-12-212-2/+2
| | | | | | | |
| * | | | | | | Change name of expire constantKim "BKC" Carlbäcker2016-12-161-3/+3
| | | | | | | |
| * | | | | | | Make expire-time a constant, correct function in ServiceKim "BKC" Carlbäcker2016-12-162-3/+4
| | | | | | | |
| * | | | | | | Use Token instead of IDKim "BKC" Carlbäcker2016-12-161-1/+1
| | | | | | | |
| * | | | | | | Do things in the correct orderKim "BKC" Carlbäcker2016-12-162-1/+3
| | | | | | | |
| * | | | | | | Don't use redis.multiKim "BKC" Carlbäcker2016-12-161-9/+3
| | | | | | | |
| * | | | | | | Make ensure_runner_queue_value atomicKim "BKC" Carlbäcker2016-12-161-5/+7
| | | | | | | |
| * | | | | | | #NamingThingsKim "BKC" Carlbäcker2016-12-164-16/+21
| | | | | | | |
| * | | | | | | Update Runners in a ServiceKim "BKC" Carlbäcker2016-12-152-15/+13
| | | | | | | |
| * | | | | | | Move redis-logic into Ci::RunnerKim "BKC" Carlbäcker2016-12-153-12/+19
| | | | | | | |
| * | | | | | | lintingKim "BKC" Carlbäcker2016-12-152-3/+3
| | | | | | | |
| * | | | | | | Use correct variablesKim "BKC" Carlbäcker2016-12-141-1/+1
| | | | | | | |
| * | | | | | | typo-oKim "BKC" Carlbäcker2016-12-142-2/+2
| | | | | | | |
| * | | | | | | This is needed as well...Kim "BKC" Carlbäcker2016-12-141-1/+8
| | | | | | | |
| * | | | | | | Add BuildQueueWorker for injecting redis-keysKim "BKC" Carlbäcker2016-12-143-0/+25
| | | | | | | |
| * | | | | | | First attemptKim "BKC" Carlbäcker2016-12-142-0/+20
| | | | | | | |
* | | | | | | | Make university more prominent.sytses2017-01-191-1/+4
| | | | | | | |
* | | | | | | | Merge branch 'ci-submodule-doc-update' into 'master' Tomasz Maczukin2017-01-192-1/+47
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document GIT_SUBMODULE_STRATEGY See merge request !8586
View Lorry Controller Status