summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add cop prohibiting params argument in url_for47986-rubocop-safe-paramsJarka Košanová2018-11-223-0/+74
* Merge branch 'docs-fl-define-vuejs-expert-role' into 'master'Tim Zallmann2018-11-131-0/+8
|\
| * Updates wordingdocs-fl-define-vuejs-expert-roleFilipa Lacerda2018-09-261-3/+3
| * Defines Vue.js Expert RoleFilipa Lacerda2018-09-261-0/+8
* | Merge branch 'docs-update-api-path' into 'master'Achilleas Pipinellis2018-11-131-1/+1
|\ \
| * | update the part to Google+ APIAlexander Tanayno2018-11-131-1/+1
* | | Merge branch '53879-kube-token-nil' into 'master'Kamil Trzciński2018-11-137-4/+65
|\ \ \ | |/ / |/| |
| * | Fix deployment jobs using nil tokenThong Kuah2018-11-137-4/+65
|/ /
* | Merge branch 'patch-29' into 'master'Phil Hughes2018-11-131-1/+4
|\ \
| * | Fix help text in Admin Area > Background JobsMax Vogler2018-11-131-1/+4
|/ /
* | Merge branch 'zj-remove-broken-storage' into 'master'Douwe Maan2018-11-132-37/+5
|\ \
| * | Migrate storage checks to GitalyZeger-Jan van de Weg2018-11-092-37/+5
* | | Merge branch '53888-missing-favicon' into 'master'Phil Hughes2018-11-132-2/+7
|\ \ \
| * | | Adds back missing CI favicon53888-missing-faviconFilipa Lacerda2018-11-122-2/+7
* | | | Merge branch '53289-update-haml_lint-to-0-28-0' into 'master'Rémy Coutable2018-11-134-7/+12
|\ \ \ \
| * | | | Update haml_lint to 0.28.0Takuya Noguchi2018-10-294-7/+12
* | | | | Merge branch '53291-update-ffaker-to-2-10-0' into 'master'Rémy Coutable2018-11-134-5/+10
|\ \ \ \ \
| * | | | | Update ffaker to 2.10.0Takuya Noguchi2018-10-294-5/+10
| |/ / / /
* | | | | Merge branch 'ashmckenzie/hmac-token-decode-and-tests' into 'master'Stan Hu2018-11-134-2/+173
|\ \ \ \ \
| * | | | | Relocate JSONWebToken::HMACToken from EEashmckenzie/hmac-token-decode-and-testsAsh McKenzie2018-11-134-2/+173
* | | | | | Merge branch '53894-docs-update-adding-project-txt-to-match-up-with-image' in...Evan Read2018-11-131-0/+1
|\ \ \ \ \ \
| * | | | | | Adding what Projects permission is needed as text to match up with the image.53894-docs-update-adding-project-txt-to-match-up-with-imageastrachan2018-11-131-0/+1
|/ / / / / /
* | | | | | Merge branch 'docs-quality/team-tasks-24' into 'master'Mek Stittri2018-11-133-52/+119
|\ \ \ \ \ \
| * | | | | | Improve the 'Testing levels' documentationdocs-quality/team-tasks-24Rémy Coutable2018-11-063-52/+119
* | | | | | | Merge branch 'align-vertical-discussion-line' into 'master'Fatih Acet2018-11-121-3/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Align all avatars and system notes in discussionalign-vertical-discussion-lineAnnabel Dunstone Gray2018-11-121-3/+3
* | | | | | | Merge branch 'ce-3777-promote-to-epic' into 'master'Rémy Coutable2018-11-1216-411/+594
|\ \ \ \ \ \ \
| * | | | | | | Extract code from Issues::MoveServicece-3777-promote-to-epicJarka Košanová2018-11-1216-411/+594
* | | | | | | | Merge branch 'fix-tags-for-envs' into 'master'Stan Hu2018-11-123-7/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix non-hacking wayKamil Trzciński2018-11-122-2/+3
| * | | | | | | | Revert "Just fix (hack) specs"Kamil Trzciński2018-11-124-9/+9
| * | | | | | | | Just fix (hack) specsKamil Trzciński2018-11-124-9/+9
| * | | | | | | | Simplify testKamil Trzciński2018-11-121-14/+9
| * | | | | | | | Do not reload self on hooks when creating deploymentfix-tags-for-envsKamil Trzciński2018-11-122-3/+6
| * | | | | | | | tags testKamil Trzciński2018-11-121-1/+13
* | | | | | | | | Merge branch 'sh-53180-append-path' into 'master'Rémy Coutable2018-11-1213-54/+43
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Make sure there's only one slash as path separatorsh-53180-append-pathStan Hu2018-11-0913-54/+43
* | | | | | | | | Merge branch 'sh-fix-refresh-service-deleted-branch' into 'master'Douwe Maan2018-11-122-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix MergeRequestService erroring out on deleted branchStan Hu2018-11-122-1/+5
* | | | | | | | | | Merge branch 'dm-disable-codeowners' into 'master'Sean McGivern2018-11-121-0/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Disable CODEOWNERS for the time beingDouwe Maan2018-11-121-0/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '52937-remove-feature-flag' into 'master'Phil Hughes2018-11-126-66/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Removes feature flag for ciEnvironmentsStatusChangesFilipa Lacerda2018-11-126-66/+2
|/ / / / / / / / /
* | | | | | | | | Merge branch 'sh-bump-redis-store' into 'master'Rémy Coutable2018-11-122-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Bump redis-store to 1.6.0sh-bump-redis-storeStan Hu2018-11-102-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'sh-bump-mime-types' into 'master'Rémy Coutable2018-11-122-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MIME type application/javascript -> application/ecmascriptsh-bump-mime-typesStan Hu2018-11-101-1/+1
| * | | | | | | | | Bump mime-types to 3.2.2Stan Hu2018-11-091-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-1221-60/+1264
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-0921-60/+1264