summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix possiblilty of branch not found47488-remove-unmergeable-notification-for-no-commits-11-0-portMark Chao2018-06-211-1/+5
* Notify only when unmergeable due to conflictMark Chao2018-06-218-68/+28
* Update VERSION to 11.0.0-rc14v11.0.0-rc14GitLab Release Tools Bot2018-06-201-1/+1
* Merge branch '11-0-stable-prepare-rc14' into '11-0-stable'Filipa Lacerda2018-06-2017-18/+44
|\
| * Merge branch '48025-branch-name-status-color-is-not-correct-anymore' into 'ma...11-0-stable-prepare-rc14Tim Zallmann2018-06-193-5/+9
| * Merge branch 'jl-update-jupyterhub-docs' into 'master'Marcia Ramos2018-06-191-1/+1
| * Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'Tim Zallmann2018-06-192-0/+6
| * Merge branch 'jivl-fix-cancel-auto-merge-button-height' into 'master'Clement Ho2018-06-191-0/+1
| * Merge branch '48047-project-integrations' into 'master'Clement Ho2018-06-191-1/+1
| * Merge branch 'jivl-fix-checkbox-top-margin' into 'master'Annabel Gray2018-06-191-7/+0
| * Merge branch '11-0-stable-prepare-rc14-revert-19501' into '11-0-stable-prepar...Mayra Cabrera2018-06-1910-147/+41
| |\
| | * Revert "Merge branch 'mk/rake-task-verify-remote-files' into 'master'"11-0-stable-prepare-rc14-revert-19501Chris Peressini2018-06-1910-147/+41
| |/
| * Merge branch 'mk/rake-task-verify-remote-files' into 'master'Stan Hu2018-06-1910-41/+147
| * Merge branch 'optimise-paused-runners' into 'master'Stan Hu2018-06-193-2/+13
| * Merge branch '47830-merge-request-diff-loading-icon-not-visible' into 'master'Annabel Gray2018-06-181-1/+1
| * Merge branch '48072-bs4-labels-in-issues-system-notes-are-misaligned-again' i...Annabel Gray2018-06-181-1/+4
| * Merge branch 'dm-favicon-redirect' into 'master'Sean McGivern2018-06-184-0/+8
|/
* Update VERSION to 11.0.0-rc13v11.0.0-rc13GitLab Release Tools Bot2018-06-181-1/+1
* Merge branch '11-0-stable-prepare-rc13' into '11-0-stable'Chris Peressini2018-06-1884-247/+410
|\
| * Merge branch '11-0-stable-prepare-rc13-fix-26810dd7-conflicts' into '11-0-sta...11-0-stable-prepare-rc13Douwe Maan2018-06-187-63/+6
| |\
| | * Delete favicon_uploader_spec.rbDouwe Maan2018-06-181-29/+0
| | * Resolve conflict in favicon_spec.rbDouwe Maan2018-06-181-5/+0
| | * Merge branch 'dm-remove-favicon-main-version' into 'master'Robert Speicher2018-06-186-33/+10
| * | Merge branch '47672-set_inline_content_type_for_ics' into 'master'Douwe Maan2018-06-187-42/+87
| * | Merge branch '11-0-stable-prepare-rc13-fix-19875-conflicts' into '11-0-stable...Filipa Lacerda2018-06-182-5/+1
| |\ \ | | |/ | |/|
| | * Fix conflicts for app/assets/javascripts/pipelines/components/graph/action_co...Filipa Lacerda2018-06-181-4/+0
| | * Merge branch 'remove-pointer-events' into 'master'Annabel Gray2018-06-182-5/+5
| |/
| * Merge branch '47068-pipeline-dropdown-shifts-around-at-smaller-screen-sizes' ...Annabel Gray2018-06-181-0/+1
| * Merge branch '47917-wiki-git-access' into 'master'Clement Ho2018-06-182-2/+1
| * Merge branch '47610-bs4-mini-graph-dropdown-sometimes-open-on-the-top' into '...Annabel Gray2018-06-182-1/+2
| * Merge branch '47879-misalignment-in-rows-on-comparison-page' into 'master'Annabel Gray2018-06-181-0/+4
| * Merge branch '47975-project-select-dropdown-is-broken-for-group-issues-and-me...Annabel Gray2018-06-181-1/+1
| * Merge branch 'fix-alert-colors' into 'master'Annabel Gray2018-06-182-3/+22
| * Merge branch 'jivl-fix-dropdown-going-out-of-screen' into 'master'Clement Ho2018-06-188-10/+10
| * Merge branch 'jivl-remove-additional-border-users-no-group' into 'master'Clement Ho2018-06-182-2/+2
| * Merge branch '47272-applications-table' into 'master'Clement Ho2018-06-181-0/+1
| * Merge branch '47933-MR-invisible-milestone' into 'master'Douwe Maan2018-06-185-6/+23
| * Merge branch '47915-badges' into 'master'Clement Ho2018-06-183-4/+4
| * Merge branch 'fix_google_oauth_docs' into 'master'Achilleas Pipinellis2018-06-181-1/+6
| * Merge branch '47513-upload-migration-lease-key-is-incorrect-for-non-mounted-u...Sean McGivern2018-06-154-8/+32
| * Merge branch 'docs-assign-ancestor-group-milestones' into 'master'Sean McGivern2018-06-151-1/+0
| * Loosen the 'newly created MR' matcherRémy Coutable2018-06-151-1/+1
| * Merge branch '47408-migrateuploadsworker-is-doing-n-1-queries-on-migration' i...Sean McGivern2018-06-157-26/+75
| * Merge branch 'jivl-fix-missing-loading-dots-job-logs' into 'master'Clement Ho2018-06-151-1/+1
| * Merge branch '47675-strange-layout-for-pipelines-list-view' into 'master'Annabel Gray2018-06-151-0/+1
| * Merge branch 'jivl-fix-create-project-template-buttons' into 'master'Annabel Gray2018-06-154-36/+33
| * Merge branch '47938-expand-diff' into 'master'Clement Ho2018-06-154-4/+4
| * Merge branch '46699-project-home-buttons' into 'master'Clement Ho2018-06-151-0/+2
| * Merge branch '47905-user-tabs-doesn-t-show-spinner' into 'master'Annabel Gray2018-06-151-1/+1
| * Merge branch '47850-placeholder-note-renders-the-user-name-in-a-new-line' int...Annabel Gray2018-06-153-5/+5