summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Extract preloaded_relations into method6649-extract-ee-specific-files-lines-for-ci-cd-app-serializersMatija Čupić2019-04-091-17/+23
* Merge branch '6573-extract-ee-spec-features-boards-ce' into 'master'Robert Speicher2019-04-092-0/+8
|\
| * Add helper reference6573-extract-ee-spec-features-boards-cecharlieablett2019-04-081-0/+1
| * Abstract out method from spec to supportcharlieablett2019-04-082-0/+7
* | Merge branch 'osw-schedule-multiple-mr-assignees-ff-auto-enabling' into 'master'Yorick Peterse2019-04-092-6/+62
|\ \
| * | Add methods to check dead and retrying jobsosw-schedule-multiple-mr-assignees-ff-auto-enablingOswaldo Ferreira2019-04-082-6/+62
* | | Merge branch 'sl-lower-remove-rspec-retries' into 'master'Sean McGivern2019-04-097-9/+13
|\ \ \
| * | | Reduce number of rspec retriesSanad Liaquat2019-04-097-9/+13
|/ / /
* | | Merge branch 'improve/rack-clean-path-info' into 'master'Douwe Maan2019-04-091-32/+1
|\ \ \
| * | | Use Rack::Utils.clean_path_info instead of copy-pasted version.Vasiliy Ermolovich2019-04-041-32/+1
* | | | Merge branch '60162-fix-time-windows' into 'master'Douwe Maan2019-04-095-14/+51
|\ \ \ \
| * | | | Resolve Environments#additional_metrics TypeError, ensure unix formatSarah Yasonik2019-04-095-14/+51
|/ / / /
* | | | Merge branch 'delay-update-statictics' into 'master'Douwe Maan2019-04-099-24/+146
|\ \ \ \
| * | | | Refactor: extract duplicate steps to a service classHiroyuki Sato2019-04-056-53/+79
| * | | | Update the project statistics immediatellyHiroyuki Sato2019-04-052-0/+11
| * | | | Refactor project_cache_worker_keyHiroyuki Sato2019-04-052-2/+2
| * | | | Fix the bug that the project statistics is not updatedHiroyuki Sato2019-04-057-22/+107
* | | | | Merge branch 'docs-fix-page-specific-javascript-link' into 'master'Achilleas Pipinellis2019-04-091-3/+3
|\ \ \ \ \
| * | | | | Fix page specific JavaScript link in documentationMark Florian2019-04-091-3/+3
|/ / / / /
* | | | | Merge branch 'docs/update-registry-user' into 'master'Achilleas Pipinellis2019-04-091-17/+18
|\ \ \ \ \
| * | | | | Update auth with registry docsEvan Read2019-04-091-17/+18
|/ / / / /
* | | | | Merge branch '46326-environment-url-validation' into 'master'Kamil Trzciński2019-04-092-0/+42
|\ \ \ \ \
| * | | | | Add environment url validationWolphin2019-04-092-0/+42
|/ / / / /
* | | | | Merge branch 'prevent-running-mr-pipelines-when-target-updated' into 'master'Kamil Trzciński2019-04-093-9/+40
|\ \ \ \ \
| * | | | | Prevent triggering pipelines when target branch is updatedprevent-running-mr-pipelines-when-target-updatedShinya Maeda2019-04-083-9/+40
* | | | | | Merge branch '30157-api-expose-single-environment' into 'master'Kamil Trzciński2019-04-0911-4/+322
|\ \ \ \ \ \
| * | | | | | Add new API endpoint to expose single environmentKrasimir Angelov2019-04-0911-4/+322
|/ / / / / /
* | | | | | Merge branch 'winh-jest-no-jasmine-globals' into 'master'Kushal Pandya2019-04-097-13/+14
|\ \ \ \ \ \
| * | | | | | Replace jasmine.createSpy() with jest.fn()Winnie Hellmann2019-04-093-3/+3
| * | | | | | Run yarn eslint --fixWinnie Hellmann2019-04-094-10/+10
| * | | | | | Enable ESLint rule jest/no-jasmine-globalsWinnie Hellmann2019-04-091-0/+1
* | | | | | | Merge branch 'ce-6099-move-ee-differences-for-app-views-admin-users-show-html...Phil Hughes2019-04-092-1/+8
|\ \ \ \ \ \ \
| * | | | | | | CE port: Move EE differences for `app/views/admin/users/show.html.haml`ce-6099-move-ee-differences-for-app-views-admin-users-show-html-hamlDennis Tang2019-04-092-1/+8
* | | | | | | | Merge branch '59708-vendor-css' into 'master'Phil Hughes2019-04-095-92/+101
|\ \ \ \ \ \ \ \
| * | | | | | | | Adds a vendors folder for third party CSSFilipa Lacerda2019-04-095-92/+101
|/ / / / / / / /
* | | | | | | | Merge branch 'note-body-ee-differences' into 'master'Filipa Lacerda2019-04-092-3/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed EE differences in note_body.vuePhil Hughes2019-04-082-3/+13
* | | | | | | | | Merge branch 'winh-filtered_search_boards' into 'master'Phil Hughes2019-04-091-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove EE-specific changes from FilteredSearchBoardswinh-filtered_search_boardsWinnie Hellmann2019-04-081-0/+4
* | | | | | | | | | Merge branch 'revert-e4b2c3b0' into 'master'Stan Hu2019-04-091-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "Merge branch 'fix-ide-web-worker-relative-url' into 'master'"revert-e4b2c3b0Mike Greiling2019-04-091-0/+6
* | | | | | | | | | | Merge branch 'issue-58418-release-notes' into 'master'Rémy Coutable2019-04-0910-21/+106
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Set release name when adding release notes to an existing tagJason Goodman2019-04-0910-21/+106
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'gitlab-managed-apps' into 'master'Evan Read2019-04-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Name GitLab managed appsgitlab-managed-appsSid Sijbrandij2019-04-081-1/+1
* | | | | | | | | | | Merge branch 'fix_qa_auto_devops_ci_masking_variable' into 'master'Ramya Authappan2019-04-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change value to something that can be maskedfix_qa_auto_devops_ci_masking_variableThong Kuah2019-04-091-2/+2
* | | | | | | | | | | | Merge branch 'docs-anchors-predefined-variables' into 'master'Evan Read2019-04-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Docs: Update predefined_variables.md to fix anchorMarcel Amirault2019-04-091-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'patch-50' into 'master'Evan Read2019-04-091-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |