summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [ci skip] Merge branch 'master' into fl-update-registry-codefl-update-registry-codeFilipa Lacerda2018-06-18185-1000/+1173
|\
| * Merge branch '47672-set_inline_content_type_for_ics' into 'master'Douwe Maan2018-06-187-42/+87
| |\
| | * Render calendar feed inline when accessed from GitLabImre Farkas2018-06-187-42/+87
| * | Merge branch 'blackst0ne-rails5-expected-the-response-to-have-status-code-ok-...Rémy Coutable2018-06-182-0/+14
| |\ \
| | * | [Rails5] Set request.format for artifacts_controllerblackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404blackst0ne2018-06-162-0/+14
| * | | Merge branch 'rails5-fix-48009' into 'master'Rémy Coutable2018-06-182-2/+7
| |\ \ \
| | * | | Rails5 update Gemfile.rails5.lockJasper Maes2018-06-162-2/+7
| | |/ /
| * | | Merge branch 'blackst0ne-rails5-expected-search-search-seed_project-got-nil' ...Rémy Coutable2018-06-182-5/+10
| |\ \ \
| | * | | [Rails5] Fix sessions_controller_specblackst0ne-rails5-expected-search-search-seed_project-got-nilblackst0ne2018-06-162-5/+10
| | |/ /
| * | | Merge branch 'blackst0ne-rails5-fix-pipeline-schedules-controller-spec' into ...Rémy Coutable2018-06-182-3/+18
| |\ \ \
| | * | | [Rails5] Fix pipeline_schedules_controller_specblackst0ne-rails5-fix-pipeline-schedules-controller-specblackst0ne2018-06-162-3/+18
| * | | | Merge branch 'expose-clean-backtrace-method-from-profiler' into 'master'Rémy Coutable2018-06-182-5/+53
| |\ \ \ \
| | * | | | Expose a clean_backtrace method from Gitlab::Profilerexpose-clean-backtrace-method-from-profilerSean McGivern2018-06-152-5/+53
| * | | | | Merge branch 'rails5-fix-47960' into 'master'Rémy Coutable2018-06-182-4/+9
| |\ \ \ \ \
| | * | | | | Rails5 fix update_attribute usage not causing a saveJasper Maes2018-06-152-4/+9
| * | | | | | Merge branch 'blackst0ne-rails5-fix-blob-requests-format' into 'master'Rémy Coutable2018-06-182-0/+18
| |\ \ \ \ \ \
| | * | | | | | [Rails5] Explicitly set request.format for blob_controllerblackst0ne-rails5-fix-blob-requests-formatblackst0ne2018-06-152-0/+18
| | |/ / / / /
| * | | | | | Merge branch '47933-MR-invisible-milestone' into 'master'Douwe Maan2018-06-185-6/+23
| |\ \ \ \ \ \
| | * | | | | | Fix milestones disappearing when changed on MR47933-MR-invisible-milestoneMario de la Ossa2018-06-155-6/+23
| * | | | | | | Merge branch 'gitaly-wiki-opt-out' into 'master'Sean McGivern2018-06-183-259/+133
| |\ \ \ \ \ \ \
| | * | | | | | | Make Gitaly wiki RPC's mandatoryJacob Vosmaer (GitLab)2018-06-183-259/+133
| |/ / / / / / /
| * | | | | | | Merge branch 'rails5-queue-name' into 'master'Sean McGivern2018-06-181-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix queue_name in Rails 5rails5-queue-nameJan Provaznik2018-06-141-1/+1
| * | | | | | | | Merge branch 'remove-ci_job_request_with_tags_matcher' into 'master'Stan Hu2018-06-172-7/+10
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove the ci_job_request_with_tags_matcherremove-ci_job_request_with_tags_matcherKamil Trzciński2018-06-172-7/+10
| * | | | | | | | | Merge branch 'optimise-paused-runners' into 'master'Stan Hu2018-06-173-2/+13
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Optimised paused runners to not re-query every 3soptimise-paused-runnersKamil Trzciński2018-06-173-2/+13
| |/ / / / / / / /
| * | | | | | | | Merge branch 'update-nav-theme-previews' into 'master'Dmitriy Zaporozhets2018-06-162-7/+8
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Harmonize theme preferences previewsupdate-nav-theme-previewsAndreas Kämmerle2018-06-162-7/+8
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch '47610-bs4-mini-graph-dropdown-sometimes-open-on-the-top' into '...Annabel Gray2018-06-162-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Fix ci mini graph dropdown alignment and positioning47610-bs4-mini-graph-dropdown-sometimes-open-on-the-topClement Ho2018-06-152-1/+2
| * | | | | | | | Merge branch '47068-pipeline-dropdown-shifts-around-at-smaller-screen-sizes' ...Annabel Gray2018-06-161-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Enable display static for ci job dropdowns so that they dont move when window...47068-pipeline-dropdown-shifts-around-at-smaller-screen-sizesClement Ho2018-06-151-0/+1
| * | | | | | | | | Merge branch 'remove-small-container-width' into 'master'Annabel Gray2018-06-167-10/+11
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Add container width for project empty placeholderGeorge Tsiolis2018-06-151-0/+1
| | * | | | | | | | Remove small container widthGeorge Tsiolis2018-06-157-10/+10
| * | | | | | | | | Merge branch '47917-wiki-git-access' into 'master'Clement Ho2018-06-152-2/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Resolve "Wiki git clone holder and dropdown is broken"Annabel Gray2018-06-152-2/+1
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'enable-no-multi-assign' into 'master'Mike Greiling2018-06-1517-13/+38
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Enable no-multi-assignment in JS filesgfyoung2018-06-1517-13/+38
| | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch '45557-machine-type-help-links' into 'master'Fatih Acet2018-06-152-7/+22
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Resolve "Update link in GitLab cluster setup form to say "see pricing""Taurie Davis2018-06-152-7/+22
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '47879-misalignment-in-rows-on-comparison-page' into 'master'Annabel Gray2018-06-151-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Resolve "Misalignment in rows on comparison page"Clement Ho2018-06-151-0/+4
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '46610-stop-horizontal-scrolling-when-clicking-on-board-issue' i...Fatih Acet2018-06-151-35/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Resolve "Stop horizontal scrolling when clicking on board issue"Constance Okoghenun2018-06-151-35/+0
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '47975-project-select-dropdown-is-broken-for-group-issues-and-me...Annabel Gray2018-06-151-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix project select dropdown in group issues and mr empty state47975-project-select-dropdown-is-broken-for-group-issues-and-merge-requestsClement Ho2018-06-151-1/+1
| * | | | | | | | | | Merge branch 'jivl-remove-additional-border-users-no-group' into 'master'Clement Ho2018-06-152-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Remove additional border from the create project pageJose2018-06-152-2/+2