summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* pass username and id associations needed in the frontend26955-handle-legacy-issue-filter-paramsMike Greiling2017-01-203-19/+37
* automatically redirect urls containing author_id or assignee_idMike Greiling2017-01-201-0/+18
* Merge branch 'fix-shared-runners-queue-update' into 'master' 26636-multiple-requests-to-ci_status-endpoints-at-the-same-timeRémy Coutable2017-01-203-3/+60
|\
| * Add missing specs for update build queue servicefix-shared-runners-queue-updateGrzegorz Bizon2017-01-202-1/+50
| * Improve readability of runner tick queue methodGrzegorz Bizon2017-01-201-3/+5
| * Fix shared runners queue updateKamil Trzcinski2017-01-201-0/+6
* | Merge branch 'participants-list' into 'master' Fatih Acet2017-01-202-0/+8
|\ \
| * | Fix participants margins to fit on one lineparticipants-listAnnabel Dunstone Gray2017-01-192-0/+8
* | | Merge branch 'fix/import-users' into 'master' Rémy Coutable2017-01-205-23/+93
|\ \ \
| * | | fix member mapper specfix/import-usersJames Lopez2017-01-202-26/+1
| * | | fix typoJames Lopez2017-01-191-1/+1
| * | | add missing changelogJames Lopez2017-01-191-0/+4
| * | | fix and refactor note user mappingJames Lopez2017-01-184-18/+41
| * | | added spec replicating the problemJames Lopez2017-01-183-3/+60
| * | | do not map usersat all unless adminJames Lopez2017-01-182-3/+14
* | | | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' Robert Speicher2017-01-2012-104/+141
|\ \ \ \
| * | | | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-envRémy Coutable2017-01-1511-36/+97
| * | | | Move default values to ApplicationSetting::DEFAULTS and use it in CurrentSett...Rémy Coutable2017-01-152-69/+45
* | | | | Merge branch 'record-used-ssh-keys-once-per-day' into 'master' Yorick Peterse2017-01-203-5/+33
|\ \ \ \ \
| * | | | | Record used SSH keys only once per dayrecord-used-ssh-keys-once-per-dayAdam Niedzielski2017-01-203-5/+33
* | | | | | 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.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.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
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | 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
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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
| * | | | | | | | | 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
View Lorry Controller Status