Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | WIP: This makes the default sort order for branches 'recently updated' rather...26890-sort-branches | Matt Lee | 2017-01-20 | 1 | -1/+1 |
* | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' | Robert Speicher | 2017-01-20 | 12 | -104/+141 |
|\ | |||||
| * | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-env | Rémy Coutable | 2017-01-15 | 11 | -36/+97 |
| * | Move default values to ApplicationSetting::DEFAULTS and use it in CurrentSett... | Rémy Coutable | 2017-01-15 | 2 | -69/+45 |
* | | Merge branch 'record-used-ssh-keys-once-per-day' into 'master' | Yorick Peterse | 2017-01-20 | 3 | -5/+33 |
|\ \ | |||||
| * | | Record used SSH keys only once per dayrecord-used-ssh-keys-once-per-day | Adam Niedzielski | 2017-01-20 | 3 | -5/+33 |
* | | | Merge branch 'workhorse-v1.3.0' into 'master' 26423-organize-labels-by-color-in-the-labels-page | Rémy Coutable | 2017-01-20 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Use Workhorse v1.3.0 | Nick Thomas | 2017-01-20 | 1 | -1/+1 |
* | | | | Merge branch '25851-document-token-scopes' into 'master' | Rémy Coutable | 2017-01-20 | 2 | -3/+13 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Add documentation around OAuth/Personal Access Token scopes. | Timothy Andrew | 2017-01-19 | 2 | -3/+13 |
* | | | | Merge branch 'rs-empty_project' into 'master' 26785-search-bar-doesnt-work-IE | Rémy Coutable | 2017-01-20 | 4 | -131/+125 |
|\ \ \ \ | |||||
| * | | | | Convert MoveToProjectFinder specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -10/+10 |
| * | | | | Convert most MergeRequest model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -22/+22 |
| * | | | | Convert most User model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -45/+39 |
| * | | | | Convert most Project model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -54/+54 |
* | | | | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' | Rémy Coutable | 2017-01-20 | 20 | -45/+71 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Renamed a file to make the transition to EE easier | Jose Ivan Vargas | 2017-01-19 | 2 | -2/+2 |
| * | | | | Fixed tests and a rubocop linter26138-combine-webhooks-and-services-settings-pages | Jose Ivan Vargas | 2017-01-18 | 4 | -10/+8 |
| * | | | | Removed the index action from both the projects hook and services controllers | Jose Ivan Vargas | 2017-01-18 | 2 | -9/+2 |
| * | | | | Corrected code style and titles | Jose Ivan Vargas | 2017-01-18 | 5 | -6/+5 |
| * | | | | Fixed more tests | Jose Ivan Vargas | 2017-01-18 | 3 | -8/+8 |
| * | | | | Fixed spinach feature tests for the services and hooks controllers | Jose Ivan Vargas | 2017-01-18 | 6 | -8/+27 |
| * | | | | Moved the webhooks and services gear options to a single one called integrations | Jose Ivan Vargas | 2017-01-18 | 9 | -15/+32 |
* | | | | | Merge branch '21698-redis-runner-last-build' into 'master' | Kamil Trzciński | 2017-01-20 | 11 | -7/+175 |
|\ \ \ \ \ | |||||
| * | | | | | Fix specs | Kamil Trzcinski | 2017-01-20 | 1 | -4/+6 |
| * | | | | | Fix specs | Kamil Trzcinski | 2017-01-19 | 2 | -2/+3 |
| * | | | | | Added CHANGELOG | Kamil Trzcinski | 2017-01-19 | 1 | -0/+4 |
| * | | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build | Kamil Trzcinski | 2017-01-19 | 323 | -1542/+2883 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix specs | Kamil Trzcinski | 2017-01-19 | 4 | -10/+39 |
| * | | | | | | Add missing build_spec | Kamil Trzcinski | 2017-01-19 | 1 | -0/+10 |
| * | | | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build | Kamil Trzcinski | 2017-01-19 | 2128 | -16907/+67314 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | WIP: Add tests and make sure that headers are set21698-redis-runner-last-build | Lin Jen-Shin | 2017-01-04 | 5 | -5/+76 |
| * | | | | | | | Fixed broken build | Kim "BKC" Carlbäcker | 2016-12-21 | 2 | -2/+2 |
| * | | | | | | | Change name of expire constant | Kim "BKC" Carlbäcker | 2016-12-16 | 1 | -3/+3 |
| * | | | | | | | Make expire-time a constant, correct function in Service | Kim "BKC" Carlbäcker | 2016-12-16 | 2 | -3/+4 |
| * | | | | | | | Use Token instead of ID | Kim "BKC" Carlbäcker | 2016-12-16 | 1 | -1/+1 |
| * | | | | | | | Do things in the correct order | Kim "BKC" Carlbäcker | 2016-12-16 | 2 | -1/+3 |
| * | | | | | | | Don't use redis.multi | Kim "BKC" Carlbäcker | 2016-12-16 | 1 | -9/+3 |
| * | | | | | | | Make ensure_runner_queue_value atomic | Kim "BKC" Carlbäcker | 2016-12-16 | 1 | -5/+7 |
| * | | | | | | | #NamingThings | Kim "BKC" Carlbäcker | 2016-12-16 | 4 | -16/+21 |
| * | | | | | | | Update Runners in a Service | Kim "BKC" Carlbäcker | 2016-12-15 | 2 | -15/+13 |
| * | | | | | | | Move redis-logic into Ci::Runner | Kim "BKC" Carlbäcker | 2016-12-15 | 3 | -12/+19 |
| * | | | | | | | linting | Kim "BKC" Carlbäcker | 2016-12-15 | 2 | -3/+3 |
| * | | | | | | | Use correct variables | Kim "BKC" Carlbäcker | 2016-12-14 | 1 | -1/+1 |
| * | | | | | | | typo-o | Kim "BKC" Carlbäcker | 2016-12-14 | 2 | -2/+2 |
| * | | | | | | | This is needed as well... | Kim "BKC" Carlbäcker | 2016-12-14 | 1 | -1/+8 |
| * | | | | | | | Add BuildQueueWorker for injecting redis-keys | Kim "BKC" Carlbäcker | 2016-12-14 | 3 | -0/+25 |
| * | | | | | | | First attempt | Kim "BKC" Carlbäcker | 2016-12-14 | 2 | -0/+20 |
* | | | | | | | | Make university more prominent. | sytses | 2017-01-19 | 1 | -1/+4 |
* | | | | | | | | Merge branch 'ci-submodule-doc-update' into 'master' | Tomasz Maczukin | 2017-01-19 | 2 | -1/+47 |
|\ \ \ \ \ \ \ \ |