summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* use proper object notation and rename isNewRepo to isNewRepoEnabledrename-repo-enabledMike Greiling2017-08-172-10/+6
|
* Merge branch 'dz-clarify-constrainer-query' into 'master'Sean McGivern2017-08-091-0/+2
|\ | | | | | | | | Explain why we use select all for project_url_constrainer.rb See merge request !13425
| * Explain why we use select all for project_url_constrainer.rbDmitriy Zaporozhets2017-08-091-0/+2
| |
* | Merge branch 'pikaday-undefined-fix' into 'master'Tim Zallmann2017-08-094-5/+5
|\ \ | |/ |/| | | | | | | | | Fix Pikaday being undefined Closes #36207 See merge request !13422
| * Fix pikaday being undefinedPhil Hughes2017-08-094-5/+5
| | | | | | | | Closes #36207
* | Merge branch '36119-issuable-workers' into 'master'Sean McGivern2017-08-096-13/+22
|\ \ | |/ |/| | | | | | | | | Simplify checking if objects exist code in new issaubles workers Closes #36119 See merge request !13365
| * Simplify checking if objects exist code in new issaubles workers36119-issuable-workersJarka Kadlecova2017-08-086-13/+22
| |
* | Merge branch 'bvl-port-storage-spec-helpers-from-ee' into 'master'Sean McGivern2017-08-091-0/+11
|\ \ | | | | | | | | | | | | Add a helper to stub storage settings with defaults See merge request !13419
| * | Add a helper to stub storage settings with defaultsbvl-port-storage-spec-helpers-from-eeBob Van Landuyt2017-08-091-0/+11
| | |
* | | Merge branch 'update-installation-docs-9-5' into 'master'Achilleas Pipinellis2017-08-091-2/+2
|\ \ \ | | | | | | | | | | | | | | | | update Install from Source instructions See merge request !13411
| * | | update Install from Source instructionsSimon Knox2017-08-091-2/+2
| | | |
* | | | Merge branch 'ask-for-exceptions-in-advance' into 'master'Rémy Coutable2017-08-091-10/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Ask for exceptions in advance See merge request !13409
| * | | | Translations can be picked without asking for exceptionsSean McGivern2017-08-091-5/+12
| | | | |
| * | | | Ask for exceptions in advanceSean McGivern2017-08-091-5/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | If a feature is really really really really important (most aren't), but we aren't confident that it is ready on the 7th, people can ask for an exception to the freeze process in advance, and it will be picked once it's merged.
* | | | Merge branch 'rc/cob-do-not-require-stackprof' into 'master'Sean McGivern2017-08-092-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't require stackprof in Gemfile See merge request !13407
| * | | | Don't require stackprof in GemfileRémy Coutable2017-08-092-2/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'update-source-install-docs-with-i18n' into 'master'Rémy Coutable2017-08-095-9/+37
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Update docs with i18n info for source installations Closes #35193 See merge request !13212
| * | | Update docs with i18n info for source installationsupdate-source-install-docs-with-i18nRubén Dávila2017-08-085-9/+37
| | | |
* | | | Merge branch ↵Rémy Coutable2017-08-092-1/+5
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absolute' into 'master' Resolve "user_avatar URL in push event webhook JSON payload is relative, should be absolute" Closes #34339 See merge request !13401
| * | | Use full path of user's avatar in webhooks34339-user_avatar-url-in-push-event-webhook-json-payload-is-relative-should-be-absoluteblackst0ne2017-08-092-1/+5
| | | |
* | | | Merge branch 'synchronous_korean_translation_in_zanata' into 'master'Rémy Coutable2017-08-091-8/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Synchronous Korean translation in zanata See merge request !13402
| * | | | Synchronous Korean translation in zanata黄涛2017-08-091-8/+11
| |/ / /
* | | | Merge branch 'patch-24' into 'master'Achilleas Pipinellis2017-08-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | there are 3 dots but it says four products. fixed See merge request !13129
| * | | | Update README.md with a more flexible sentencePaolo Falomo2017-08-071-1/+1
| | | | |
| * | | | there are 3 dots but it says four products. fixed Paolo Falomo2017-07-271-1/+1
| | | | |
* | | | | Merge branch 'docs-invalid-json-examples-for-system-hooks' into 'master'Achilleas Pipinellis2017-08-091-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing comma in System Hooks payload examples Closes #36071 See merge request !13367
| * | | | | Remove trailing comma in System Hooks payload examplesMark Fletcher2017-08-081-7/+7
| | | | | |
* | | | | | Merge branch 'sh-structured-log-docs' into 'master'Achilleas Pipinellis2017-08-091-0/+27
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Add docs on structured logging in GitLab See merge request !13396
| * | | | | Add docs on structured logging in GitLabsh-structured-log-docsStan Hu2017-08-081-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'winh-restore-blob-fixture' into 'master'Filipa Lacerda2017-08-081-0/+29
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore blob fixture for JavaScript tests Closes #36187 See merge request !13399
| * | | | | Restore blob fixture for JavaScript testswinh-restore-blob-fixturewinh2017-08-081-0/+29
|/ / / / /
* | | | | Correct `Gemfile.lock` for latest rubocop-gitlab-security gemspecRobert Speicher2017-08-081-4/+4
| | | | |
* | | | | Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0834-48/+90
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add rubocop-gitlab-security gem See merge request !12177
| * | | | | Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0834-48/+90
| | | | | |
* | | | | | Merge branch 'fly-out-nav-collapsed' into 'master'Annabel Dunstone Gray2017-08-083-9/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix fly-out navigation not showing for active items in collapsed sidebar See merge request !13353
| * | | | | | Fix fly-out navigation not showing for active items in collapsed sidebarPhil Hughes2017-08-083-9/+78
|/ / / / / /
* | | | | | Merge branch '36168-fix-transient-preferences-specs' into 'master'Sean McGivern2017-08-081-12/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Profile > Preferences feature specs See merge request !13382
| * | | | | | Fix Profile > Preferences feature specs36168-fix-transient-preferences-specsRémy Coutable2017-08-081-12/+16
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'remove-repo-editor-feature-flag' into 'master'Jacob Schatz2017-08-084-27/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove repo editor feature flag from RC1 See merge request !13379
| * | | | | | Revert "Add user_dropdown_link to prompt users to turn on new repo"remove-repo-editor-feature-flagMike Greiling2017-08-083-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 79f94c8d221f9391f48899808b7a36e3905dab83.
| * | | | | | hide the feature flag for the repo editor featureMike Greiling2017-08-081-22/+0
| | | | | | |
| * | | | | | Revert "Combine 'turn on/off' user dropdown links into 'experimental ↵Mike Greiling2017-08-085-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | features' link and andded 'experimental features' heading for user preferences page" This reverts commit 75f490a4c95c41f9364e8e0cba443b312f01a686.
* | | | | | | Merge branch '36169-fix-master' into 'master'Sean McGivern2017-08-081-13/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a broken Events API spec See merge request !13381
| * | | | | | | Fix a broken Events API spec36169-fix-masterRémy Coutable2017-08-081-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'gitaly-bundle-gemfile' into 'master'Rémy Coutable2017-08-082-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unset BUNDLE_GEMFILE when installing Gitaly See merge request !13378
| * | | | | | | | Unset BUNDLE_GEMFILE when installing GitalyJacob Vosmaer2017-08-082-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch ↵Rémy Coutable2017-08-085-8/+29
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-one' into 'master' Resolve "API v4 allows setting a branch that doesn't exist as the default one" Closes #36010 See merge request !13359
| * | | | | | | | | Add checks for branch existence before changing HEAD36010-api-v4-allows-setting-a-branch-that-doesn-t-exist-as-the-default-oneblackst0ne2017-08-085-8/+29
| | | | | | | | | |
* | | | | | | | | | Merge branch ↵Filipa Lacerda2017-08-087-4/+84
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-ui' into 'master' Resolve "'Please select a file' when attempting to upload or replace from the UI" Closes #35052 See merge request !12863
| * | | | | | | | | disable file upload button while uploading35052-please-select-a-file-when-attempting-to-upload-or-replace-from-the-uiSimon Knox2017-08-087-4/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hide placeholder text when files have been added vertically center dropzone area content close modal after file upload succeeds