summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix space43270-import-with-milestones-failingJames Lopez2018-06-251-1/+1
* refactor code based on feedbackJames Lopez2018-06-253-20/+22
* add some more commentsJames Lopez2018-06-222-5/+10
* fix specJames Lopez2018-06-221-3/+1
* fix specJames Lopez2018-06-221-2/+0
* add more specs and refactor more relation factory codeJames Lopez2018-06-224-9/+118
* refactor code based on feedbackJames Lopez2018-06-224-91/+84
* add changelogJames Lopez2018-06-201-0/+5
* refactor code once again to fix IID issuesJames Lopez2018-06-203-28/+13
* refactor code once again to fix IID issuesJames Lopez2018-06-203-42/+47
* fix some more edge casesJames Lopez2018-06-202-21/+13
* refactor finderJames Lopez2018-06-201-9/+13
* fix some edge casesJames Lopez2018-06-193-12/+20
* refactor relation factoryJames Lopez2018-06-192-36/+45
* update specJames Lopez2018-06-191-6/+55
* add group finder spec and logicJames Lopez2018-06-192-0/+54
* Merge branch '43270-import-with-milestones-failing' of gitlab.com:gitlab-org/...James Lopez2018-06-185-18/+36
|\
| * Merge branch '46429-creating-a-deploy-token-doesn-t-bring-back-to-the-creatio...Fatih Acet2018-06-185-18/+36
| |\
| | * Resolve "Creating a deploy token doesn't bring back to the creation page"Sam Beckham2018-06-185-18/+36
| |/
* | add spec replicating both label and milestone duplicated title issuesJames Lopez2018-06-181-0/+2
* | add spec replicating both label and milestone duplicated title issuesJames Lopez2018-06-182-5/+38
|/
* 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
|\ \ \ \ \ \ \