summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge branch '47646-ui-glitch' into 'master'Clement Ho2018-06-152-0/+6
* Merge branch '47825-gitaly-modal' into 'master'Clement Ho2018-06-157-12/+20
* Merge branch '46700-auto-devops' into 'master'Clement Ho2018-06-151-1/+1
* Merge branch 'ide-pipeline-reset-state' into 'master'Filipa Lacerda2018-06-156-9/+50
* Merge branch '47871-new-mr-tab-active-state' into 'master'Clement Ho2018-06-152-1/+6
* Merge branch '47851-bump-cache-for-old-master-permission' into 'master'Dmitriy Zaporozhets2018-06-151-1/+1
* Update VERSION to 11.0.0-rc12v11.0.0-rc1211-0-stable-revert-cherry-pickGitLab Release Tools Bot2018-06-141-1/+1
* Merge branch '11-0-stable-prepare-rc12' into '11-0-stable'Marin Jankovski2018-06-1410-28/+40
|\
| * Merge branch 'qa-clear-session-only-if-block-given-and-no-errors' into 'master'11-0-stable-prepare-rc12Rémy Coutable2018-06-141-13/+1
| * Merge branch 'assignee-lists-tiers-docs' into 'master'Sean McGivern2018-06-141-6/+6
| * Merge branch 'sql-buckets' into 'master'Stan Hu2018-06-143-2/+7
| * Merge branch 'jivl-fix-repository-instruction-wrapping-text' into 'master'Clement Ho2018-06-141-4/+4
| * Merge branch 'bvl-missing-message-on-access-denied' into 'master'Robert Speicher2018-06-144-3/+22
|/
* Update VERSION to 11.0.0-rc11v11.0.0-rc11GitLab Release Tools Bot2018-06-131-1/+1
* Merge branch '11-0-stable-prepare-rc11' into '11-0-stable'Mayra Cabrera2018-06-1342-226/+553
|\
| * Fix conflicts in .pot fileFilipa Lacerda2018-06-131-25/+135
| * Merge branch '47823-fix-issue-boards-label-list-creation' into 'master'Phil Hughes2018-06-131-1/+2
| * Merge branch '47501-link-scroll' into 'master'Clement Ho2018-06-135-26/+23
| * Merge branch 'jr-11-0-web-ide-docs' into 'master'Tim Zallmann2018-06-131-0/+21