summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
* Merge branch '25651-fix-master' into 'master' Rémy Coutable2016-12-141-1/+1
|\
| * Fix wrong error message expectation in API::Commits spec25651-fix-masterRémy Coutable2016-12-141-1/+1
* | Merge branch 'process-commit-worker-migration-encoding' into 'master' Rémy Coutable2016-12-143-7/+44
|\ \
| * | Encode when migrating ProcessCommitWorker jobsprocess-commit-worker-migration-encodingYorick Peterse2016-12-133-7/+44
* | | Merge branch '25136-last-deployment-link' into 'master' Grzegorz Bizon2016-12-144-4/+46
|\ \ \ | |_|/ |/| |
| * | Changes after review25136-last-deployment-linkFilipa Lacerda2016-12-073-24/+19
| * | Changes after reviewFilipa Lacerda2016-12-073-13/+11
| * | Updates testsFilipa Lacerda2016-12-071-12/+30
| * | Fix broken link for latest deploymentFilipa Lacerda2016-12-074-2/+33
* | | Merge branch '20052-actions-table-vscroll' into 'master' Annabel Dunstone Gray2016-12-133-13/+16
|\ \ \
| * | | Prevent overflow with vertical scroll when we have space to show content20052-actions-table-vscrollFilipa Lacerda2016-12-133-13/+16
* | | | Merge branch 'backport/group-policies' into 'master' Rémy Coutable2016-12-132-0/+12
|\ \ \ \
| * | | | Backport hooks on group policies for the EE-specific implementationbackport/group-policiesDouglas Barbosa Alexandre2016-12-132-0/+12
* | | | | Merge branch 'api-cherry-pick' into 'master' Rémy Coutable2016-12-134-1/+148
|\ \ \ \ \
| * | | | | Make rubocop happyapi-cherry-pickRobert Schilling2016-12-131-1/+1
| * | | | | API: Ability to cherry-pick a commitRobert Schilling2016-12-134-1/+148
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master' Rémy Coutable2016-12-133-2/+7
|\ \ \ \ \
| * | | | | For single line git commit messages, the close quote should be on the same li...jzinn/gitlab-ce-chomp-git-status-messageJulian Zinn2016-12-133-2/+7
| | |_|/ / | |/| | |
* | | | | Merge branch '25482-fix-api-sudo' into 'master' Sean McGivern2016-12-137-113/+149
|\ \ \ \ \
| * | | | | Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudoRémy Coutable2016-12-135-32/+15
| * | | | | API: Memoize the current_user so that the sudo can work properlyRémy Coutable2016-12-125-96/+149
* | | | | | Merge branch 'move-admin-settings-feature-to-rspec' into 'master' Rémy Coutable2016-12-133-57/+25
|\ \ \ \ \ \
| * | | | | | Move admin settings spinach feature to rspecjurre2016-12-133-57/+25
* | | | | | | Merge branch 'api-simple-group-project' into 'master' Rémy Coutable2016-12-134-9/+32
|\ \ \ \ \ \ \
| * | | | | | | API: Ability to get group's project in simple representationapi-simple-group-projectRobert Schilling2016-12-134-9/+32
* | | | | | | | Merge branch 'dz-create-routes-lower-index' into 'master' Dmitriy Zaporozhets2016-12-133-1/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Add AddLowerPathIndexToRoutes to setup_postgresql.rakeDmitriy Zaporozhets2016-12-131-0/+4
| * | | | | | | | Add index to routes table on lower path for postgresqldz-create-routes-lower-indexDmitriy Zaporozhets2016-12-122-1/+23
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'allow-more-filenames' into 'master' Rémy Coutable2016-12-133-2/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow all alphanumeric characters in file names (!8002)winniehell2016-12-132-2/+6
| * | | | | | | | Add failing test for #20190winniehell2016-12-131-0/+44
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '25518-uniquely-style-labels' into 'master' Fatih Acet2016-12-133-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | added border-radius and padding to labels25518-uniquely-style-labelsDimitrie Hoekstra2016-12-133-1/+4