summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update regression labelingbikebilly2018-06-181-4/+4
|
* Explain milestone usageFabio Busatto (OOO until 19/3)2018-06-181-7/+11
|
* Fix typoFabio Busatto (OOO until 19/3)2018-06-181-2/+2
|
* Better clarify the processFabio Busatto (OOO until 19/3)2018-06-181-14/+9
|
* Add bug label tooFabio Busatto (OOO until 19/3)2018-06-181-1/+1
|
* CopyeditsFabio Busatto (OOO until 19/3)2018-06-181-1/+1
|
* CopyeditFabio Busatto (OOO until 19/3)2018-06-181-1/+1
|
* Simplified the processFabio Busatto2018-06-181-13/+9
|
* CopyeditFabio Busatto2018-06-181-1/+2
|
* Add how to manage a regressionFabio Busatto2018-06-181-5/+31
|
* Merge branch ↵Fatih Acet2018-06-185-18/+36
|\ | | | | | | | | | | | | | | | | '46429-creating-a-deploy-token-doesn-t-bring-back-to-the-creation-page' into 'master' Resolve "Creating a deploy token doesn't bring back to the creation page" Closes #46429 See merge request gitlab-org/gitlab-ce!19639
| * Resolve "Creating a deploy token doesn't bring back to the creation page"Sam Beckham2018-06-185-18/+36
|/
* Merge branch '47672-set_inline_content_type_for_ics' into 'master'Douwe Maan2018-06-187-42/+87
|\ | | | | | | | | | | | | Render calendar feed inline when accessed from GitLab Closes #47672 See merge request gitlab-org/gitlab-ce!19698
| * Render calendar feed inline when accessed from GitLabImre Farkas2018-06-187-42/+87
| | | | | | | | | | | | | | With text/calendar as Content-Type, the browser always downloads the content as a file (even ignoring the Content-Disposition header). We want to display the content inline when accessed from GitLab, similarly to the RSS feed.
* | Merge branch ↵Rémy Coutable2018-06-182-0/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'blackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404' into 'master' Resolve "[Rails5] expected the response to have status code :ok but it was 404" Closes #48008 See merge request gitlab-org/gitlab-ce!19937
| * | [Rails5] Set request.format for artifacts_controllerblackst0ne-rails5-expected-the-response-to-have-status-code-ok-but-it-was-404blackst0ne2018-06-162-0/+14
| | | | | | | | | | | | | | | | | | | | | Since Rails 5 request.format gets set by extension if it's not explicitly set. That means artifacts_controller#file no longer works as expected. This commit explicitly sets request.format for artifacts_controller#file.
* | | Merge branch 'rails5-fix-48009' into 'master'Rémy Coutable2018-06-182-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rails5 update Gemfile.rails5.lock Closes #48009 See merge request gitlab-org/gitlab-ce!19921
| * | | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "[Rails5] expected: "/search?search=seed_project" got: nil" Closes #48013 See merge request gitlab-org/gitlab-ce!19936
| * | | [Rails5] Fix sessions_controller_specblackst0ne-rails5-expected-search-search-seed_project-got-nilblackst0ne2018-06-162-5/+10
| |/ / | | | | | | | | | | | | Refactor sessions_controller_spec to work both in rails4 and rails5. Remove the stubbed `request.referer` method, set real header instead.
* | | Merge branch 'blackst0ne-rails5-fix-pipeline-schedules-controller-spec' into ↵Rémy Coutable2018-06-182-3/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [Rails5] Fix pipeline_schedules_controller_spec Closes #48011 See merge request gitlab-org/gitlab-ce!19919
| * | | [Rails5] Fix pipeline_schedules_controller_specblackst0ne-rails5-fix-pipeline-schedules-controller-specblackst0ne2018-06-162-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5.0 there's a bug [1] in controller tests that doesn't parse nested parameters correctly. This commit brings a workaround to make specs work again both in rails4 and rails5. [1]: https://github.com/rails/rails/issues/23997
* | | | Merge branch 'expose-clean-backtrace-method-from-profiler' into 'master'Rémy Coutable2018-06-182-5/+53
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Expose a clean_backtrace method from Gitlab::Profiler See merge request gitlab-org/gitlab-ce!19894
| * | | | Expose a clean_backtrace method from Gitlab::Profilerexpose-clean-backtrace-method-from-profilerSean McGivern2018-06-152-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | This method makes it easier for other parts of the app to get clean backtraces, as well as console users.
* | | | | Merge branch 'rails5-fix-47960' into 'master'Rémy Coutable2018-06-182-4/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix update_attribute usage not causing a save Closes #47960 See merge request gitlab-org/gitlab-ce!19881
| * | | | | 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_controller Closes #47921 See merge request gitlab-org/gitlab-ce!19876
| * | | | | | [Rails5] Explicitly set request.format for blob_controllerblackst0ne-rails5-fix-blob-requests-formatblackst0ne2018-06-152-0/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 4.2 if params[:format] is empty, Rails set it to :html But since Rails 5.0 the framework now looks for an extension. E.g. for `blob/master/CHANGELOG.md` in Rails 4 the format would be `:html`, but in Rails 5 on it'd be `:md` This commit explicitly sets the `:html` format for all requests unless `:format` is set by a client e.g. by JS for XHR requests.
* | | | | | Merge branch '47933-MR-invisible-milestone' into 'master'Douwe Maan2018-06-185-6/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Milestone not updating in MR sidebar after selection" Closes #47933 See merge request gitlab-org/gitlab-ce!19870
| * | | | | | 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 mandatory See merge request gitlab-org/gitlab-ce!19701
| * | | | | | | 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 5 Closes #47372 See merge request gitlab-org/gitlab-ce!19874
| * | | | | | | Fix queue_name in Rails 5rails5-queue-nameJan Provaznik2018-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails 5 DeliveryJob.queue_name may return Proc (probably if block is used for queue name definition). Instance method takes handles this already and returns string as expected.
* | | | | | | | Merge branch 'remove-ci_job_request_with_tags_matcher' into 'master'Stan Hu2018-06-172-7/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the ci_job_request_with_tags_matcher See merge request gitlab-org/gitlab-ce!19947
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Optimise paused runners See merge request gitlab-org/gitlab-ce!19946
| * | | | | | | | Optimised paused runners to not re-query every 3soptimise-paused-runnersKamil Trzciński2018-06-173-2/+13
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have long polling mechanism which is not being used by paused runners. This makes the paused runner to generate a request every 3s, where it could be fired only every 1h.
* | | | | | | | Merge branch 'update-nav-theme-previews' into 'master'Dmitriy Zaporozhets2018-06-162-7/+8
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Harmonize theme preferences previews See merge request gitlab-org/gitlab-ce!19916
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "BS4: Mini graph dropdown sometimes open on the top" Closes #47610 See merge request gitlab-org/gitlab-ce!19912
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Pipeline dropdown shifts around at smaller screen sizes" Closes #47068 See merge request gitlab-org/gitlab-ce!19910
| * | | | | | | | Enable display static for ci job dropdowns so that they dont move when ↵47068-pipeline-dropdown-shifts-around-at-smaller-screen-sizesClement Ho2018-06-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | window resizes
* | | | | | | | | Merge branch 'remove-small-container-width' into 'master'Annabel Gray2018-06-167-10/+11
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove small container width Closes #36439 See merge request gitlab-org/gitlab-ce!19893
| * | | | | | | | 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" Closes #47917 See merge request gitlab-org/gitlab-ce!19913
| * | | | | | | | | 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 files See merge request gitlab-org/gitlab-ce!19808
View Lorry Controller Status