summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ignore SQL CACHE hits in Sherlocksherlock-ignore-cacheYorick Peterse2017-11-031-1/+3
* Merge branch 'refactor-responsive-tables-for-nested-error' into 'master'Annabel Dunstone Gray2017-11-027-77/+103
|\
| * Refactor responsive table styles to support nested error blockrefactor-responsive-tables-for-nested-errorEric Eastwood2017-11-027-77/+103
* | Merge branch 'gitaly-ff-merge' into 'master'Rémy Coutable2017-11-025-30/+115
|\ \
| * | Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-mergeAlejandro Rodríguez2017-10-315-30/+115
* | | Merge branch 'winh-update-nvmrc' into 'master'Phil Hughes2017-11-021-1/+1
|\ \ \
| * | | Update .nvmrc to current stable (v9.0.0)winh-update-nvmrcWinnie Hellmann2017-11-021-1/+1
* | | | Merge branch 'icons-ci-icons' into 'master'Filipa Lacerda2017-11-0264-281/+293
|\ \ \ \
| * | | | Fix for Dropdown Icon Positionicons-ci-iconsTim Zallmann2017-11-011-3/+3
| * | | | Needed to change 0px to 0Tim Zallmann2017-10-301-1/+1
| * | | | Missing Comma addedTim Zallmann2017-10-301-1/+1
| * | | | Fixed different sizesTim Zallmann2017-10-302-6/+33
| * | | | Added Missing SemicolonTim Zallmann2017-10-301-1/+1
| * | | | Improved Var Caching, Line Setup, SpecsTim Zallmann2017-10-303-18/+20
| * | | | fdescribe remove :-/Tim Zallmann2017-10-301-1/+1
| * | | | Updated icon.vue to be more inline with other components + added spec for itTim Zallmann2017-10-303-8/+49
| * | | | Lets try with trigger('click')Tim Zallmann2017-10-302-2/+2
| * | | | Fixes another problem that happens during knapsack testingTim Zallmann2017-10-301-1/+1
| * | | | Fixing Tests and CSS displayTim Zallmann2017-10-303-10/+18
| * | | | Fixes one icon testTim Zallmann2017-10-301-1/+1
| * | | | Test FixesTim Zallmann2017-10-303-3/+3
| * | | | Fixes for TestsTim Zallmann2017-10-3013-55/+34
| * | | | Update Action IconsTim Zallmann2017-10-3010-25/+20
| * | | | Fixing IconsTim Zallmann2017-10-3019-151/+112
| * | | | Updated also Badge + Dropdown IconsTim Zallmann2017-10-3020-22/+22
| * | | | Comma to muchTim Zallmann2017-10-301-1/+1
| * | | | Now one test works lets get the other one greenTim Zallmann2017-10-301-1/+1
| * | | | CHanged to String StatusesTim Zallmann2017-10-301-4/+4
| * | | | Need to render it into String cause its a content_tagTim Zallmann2017-10-301-2/+2
| * | | | Fixed SVG Output TestTim Zallmann2017-10-301-8/+4
| * | | | Fix the size of a status iconTim Zallmann2017-10-301-1/+1
| * | | | Updated Static Icons from CI AreaTim Zallmann2017-10-304-22/+25
* | | | | Merge branch 'clarify-docs-about-external-artifacts-and-gitlab-pages' into 'm...Grzegorz Bizon2017-11-021-2/+4
|\ \ \ \ \
| * | | | | Clarify external artifacts only working when GitLab pages is enabledclarify-docs-about-external-artifacts-and-gitlab-pagesEric Eastwood2017-11-021-2/+4
* | | | | | Merge branch 'dm-sidekiq-sigstp' into 'master'Sean McGivern2017-11-023-17/+91
|\ \ \ \ \ \
| * | | | | | Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when t...dm-sidekiq-sigstpDouwe Maan2017-11-023-17/+91
* | | | | | | Merge branch 'dm-remove-private-token' into 'master'Sean McGivern2017-11-0260-951/+587
|\ \ \ \ \ \ \
| * | | | | | | Update documentationdm-remove-private-tokenDouwe Maan2017-11-023-66/+75
| * | | | | | | Add changelog itemsDouwe Maan2017-11-024-0/+21
| * | | | | | | Update specs for sudo behaviorDouwe Maan2017-11-023-241/+155
| * | | | | | | Move RSS and incoming email tokens from User Settings > Accounts to User Sett...Douwe Maan2017-11-025-37/+53
| * | | | | | | Remove user authentication_token columnDouwe Maan2017-11-023-2/+21
| * | | | | | | Migrate user private tokens to personal access tokensDouwe Maan2017-11-022-0/+103
| * | | | | | | Add sudo API scopeDouwe Maan2017-11-0211-98/+74
| * | | | | | | Consistently use PersonalAccessToken instead of PersonalTokenDouwe Maan2017-11-024-15/+15
| * | | | | | | Remove User#private_tokenDouwe Maan2017-11-021-4/+1
| * | | | | | | Remove authentication using user.private_tokenDouwe Maan2017-11-0215-200/+75
| * | | | | | | Remove tokens:reset_all_auth rake taskDouwe Maan2017-11-022-17/+1
| * | | | | | | Remove gitlab:users:clear_all_authentication_tokens rake taskDouwe Maan2017-11-023-64/+0
| * | | | | | | Remove private_token from API user entityDouwe Maan2017-11-026-20/+7