summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '43263-git-push-option-to-create-mr' into 'master'Nick Thomas2019-04-094-3/+165
|\
| * Update service to handle unexpected exceptions43263-git-push-option-to-create-mrLuke Duncalfe2019-04-091-0/+3
| * Refactor PushOptionsHandlerService from reviewLuke Duncalfe2019-04-091-44/+53
| * Support merge on pipeline success w/ push optionsLuke Duncalfe2019-04-091-9/+32
| * Use Gitlab::PushOptions for `ci.skip` push optionLuke Duncalfe2019-04-093-3/+3
| * Support merge request create with push optionsLuke Duncalfe2019-04-091-0/+127
* | Merge branch '59903-env-css' into 'master'Phil Hughes2019-04-0910-349/+288
|\ \
| * | Fixes stylelint warnings in environmentsFilipa Lacerda2019-04-0910-349/+288
* | | Merge branch 'noteable-note-ee-differences' into 'master'Filipa Lacerda2019-04-092-8/+22
|\ \ \
| * | | Fixed EE differences in noteable_note.vuePhil Hughes2019-04-092-8/+22
* | | | 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
* | | | | Resolve Environments#additional_metrics TypeError, ensure unix formatSarah Yasonik2019-04-093-14/+11
* | | | | Merge branch 'delay-update-statictics' into 'master'Douwe Maan2019-04-094-6/+52
|\ \ \ \ \
| * | | | | Refactor: extract duplicate steps to a service classHiroyuki Sato2019-04-053-8/+22
| * | | | | Update the project statistics immediatellyHiroyuki Sato2019-04-051-0/+7
| * | | | | Refactor project_cache_worker_keyHiroyuki Sato2019-04-051-1/+1
| * | | | | Fix the bug that the project statistics is not updatedHiroyuki Sato2019-04-053-6/+31
* | | | | | Merge branch 'prevent-running-mr-pipelines-when-target-updated' into 'master'Kamil Trzciński2019-04-091-2/+8
|\ \ \ \ \ \
| * | | | | | Prevent triggering pipelines when target branch is updatedprevent-running-mr-pipelines-when-target-updatedShinya Maeda2019-04-081-2/+8
* | | | | | | 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
* | | | | | | | Adds a vendors folder for third party CSSFilipa Lacerda2019-04-093-91/+95
* | | | | | | | 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
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Set release name when adding release notes to an existing tagJason Goodman2019-04-094-13/+20
|/ / / / / / / /
* | | | | | | | Merge branch '60231-pipeline-regression-fix' into 'master'Mike Greiling2019-04-081-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Override problematic display with utility class60231-pipeline-regression-fixsarahghp2019-04-081-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch '60123-graphql-complexity-limit-too-low-for-schema-load' into 'm...Douglas Barbosa Alexandre2019-04-081-5/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Increase GraphQL complexityBrett Walker2019-04-081-5/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '15463-extract-hooks-service' into 'master'Robert Speicher2019-04-088-259/+319
|\ \ \ \ \ \ \
| * | | | | | | Extract a Git::{Base,Tag,Branch}HooksServiceNick Thomas2019-04-058-259/+319
* | | | | | | | Fix `updated_at` doesn't apply to `state_event` updates of issues via APISean McGivern2019-04-085-4/+14
| |/ / / / / / |/| | | | | |
* | | | | | | Externalize strings in flash messagesMartin Wortschack2019-04-0813-34/+34
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'instance-configuration-artifact-size' into 'master'Rémy Coutable2019-04-081-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Display maximum artifact size from runtime configBastian Blank2019-04-031-1/+1
* | | | | | Fix touch event pageXftab2019-04-083-21/+52
* | | | | | Migrate clusters tests to jestEnrique Alcántara2019-04-081-1/+1
* | | | | | Merge branch '60116-fix-button-wrapping' into 'master'Phil Hughes2019-04-081-0/+1
|\ \ \ \ \ \
| * | | | | | Fix button text wrapping to next line60116-fix-button-wrappingAnnabel Dunstone Gray2019-04-051-0/+1
* | | | | | | Merge branch 'sh-add-gitaly-ref-name-caching-tree-controller' into 'master'James Lopez2019-04-081-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Enable Gitaly FindCommit caching for TreeControllersh-add-gitaly-ref-name-caching-tree-controllerStan Hu2019-04-071-0/+2
| | |_|_|/ / / | |/| | | | |
* | | | | | | Improve project merge request settingsce-proj-settings-ok-mr-settings-onlyLuke Bennett2019-04-073-35/+30
|/ / / / / /
* | | | | | Merge branch 'sh-improve-find-commit-caching' into 'master'Kamil Trzciński2019-04-074-4/+7
|\ \ \ \ \ \
| * | | | | | Expand FindCommit caching to blob and refssh-improve-find-commit-cachingStan Hu2019-04-064-4/+7
* | | | | | | Handle possible HTTP exception for Sentry clientPeter Leitzen2019-04-071-2/+2
View Lorry Controller Status