summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '47672-set_inline_content_type_for_ics' into 'master'Douwe Maan2018-06-183-24/+54
|\
| * Render calendar feed inline when accessed from GitLabImre Farkas2018-06-183-24/+54
* | Merge branch 'blackst0ne-rails5-expected-search-search-seed_project-got-nil' ...Rémy Coutable2018-06-181-5/+5
|\ \
| * | [Rails5] Fix sessions_controller_specblackst0ne-rails5-expected-search-search-seed_project-got-nilblackst0ne2018-06-161-5/+5
* | | Merge branch 'blackst0ne-rails5-fix-pipeline-schedules-controller-spec' into ...Rémy Coutable2018-06-181-3/+13
|\ \ \
| * | | [Rails5] Fix pipeline_schedules_controller_specblackst0ne-rails5-fix-pipeline-schedules-controller-specblackst0ne2018-06-161-3/+13
| |/ /
* | | Merge branch 'expose-clean-backtrace-method-from-profiler' into 'master'Rémy Coutable2018-06-181-0/+45
|\ \ \
| * | | Expose a clean_backtrace method from Gitlab::Profilerexpose-clean-backtrace-method-from-profilerSean McGivern2018-06-151-0/+45
* | | | Merge branch 'rails5-fix-47960' into 'master'Rémy Coutable2018-06-181-4/+4
|\ \ \ \
| * | | | Rails5 fix update_attribute usage not causing a saveJasper Maes2018-06-151-4/+4
* | | | | Merge branch '47933-MR-invisible-milestone' into 'master'Douwe Maan2018-06-182-2/+16
|\ \ \ \ \
| * | | | | Fix milestones disappearing when changed on MR47933-MR-invisible-milestoneMario de la Ossa2018-06-152-2/+16
* | | | | | Make Gitaly wiki RPC's mandatoryJacob Vosmaer (GitLab)2018-06-182-111/+111
* | | | | | 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
* | | | | | | Optimised paused runners to not re-query every 3soptimise-paused-runnersKamil Trzciński2018-06-171-1/+3
| |_|_|_|/ / |/| | | | |
* | | | | | Enable no-multi-assignment in JS filesgfyoung2018-06-154-4/+8
* | | | | | Merge branch 'fix-web-ide-disable-markdown-autocomplete' into 'master'Phil Hughes2018-06-151-0/+19
|\ \ \ \ \ \
| * | | | | | Fix #47796 "Web IDE autocomplete should be disabled in markdown files"Isaac Smith2018-06-151-0/+19
* | | | | | | Merge branch 'ide-commit-actions-update' into 'master'Filipa Lacerda2018-06-154-12/+17
|\ \ \ \ \ \ \
| * | | | | | | fixed karma specPhil Hughes2018-06-141-2/+2
| * | | | | | | fixed sidebar list specPhil Hughes2018-06-141-1/+1
| * | | | | | | fixed hover styling caused by dropdownPhil Hughes2018-06-143-9/+14
* | | | | | | | Merge branch 'dm-remove-favicon-main-version' into 'master'Robert Speicher2018-06-154-48/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove FaviconUploader favicon_main versiondm-remove-favicon-main-versionDouwe Maan2018-06-154-48/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Enable no-restricted-globals in JS filesgfyoung2018-06-1510-15/+15
* | | | | | | | Merge branch '47915-badges' into 'master'Clement Ho2018-06-151-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix specsClement Ho2018-06-151-2/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-flakey-move-slash-command-unauthorized-project' into 'master'Robert Speicher2018-06-151-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fix flakey move slash command with unauthorized projectfix-flakey-move-slash-command-unauthorized-projectEric Eastwood2018-06-141-1/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'bvl-graphql-nested-merge-request' into 'master'Douwe Maan2018-06-157-92/+89
|\ \ \ \ \ \ \
| * | | | | | | Allow querying a single MR within a projectBob Van Landuyt2018-06-157-92/+89
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'fix-rails5-nagative-enum-spec' into 'master'Kamil Trzciński2018-06-151-8/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unexpected data store test suitefix-rails5-nagative-enum-specShinya Maeda2018-06-151-8/+0
| * | | | | | | Fix "[Rails5] '-1' is not a valid data_store"Shinya Maeda2018-06-151-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'ide-add-last-commit-id-to-api-call' into 'master'Douwe Maan2018-06-152-71/+84
|\ \ \ \ \ \ \
| * | | | | | | only return last_commit_sha in the JSONide-add-last-commit-id-to-api-callPhil Hughes2018-06-152-9/+3
| * | | | | | | IDE sends last commit ID when committing changesPhil Hughes2018-06-152-71/+90
* | | | | | | | Merge branch 'ce-jej/sanitize-group-saml-relay-state' into 'master'Kamil Trzciński2018-06-151-0/+25
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Backport InternalRedirect#sanitize_redirectce-jej/sanitize-group-saml-relay-stateJames Edwards-Jones2018-06-141-0/+25
* | | | | | | | Merge branch '46668-make-the-html-attribute-on-the-blob-json-call-optional' i...Douwe Maan2018-06-151-0/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Reuse viewer param and move logic to blob controllerDouwe Maan2018-06-151-2/+3
| * | | | | | | | Changed the query string parameter to a string46668-make-the-html-attribute-on-the-blob-json-call-optionalTim Zallmann2018-06-151-1/+1
| * | | | | | | | Fixed linting error with trailing space in rbTim Zallmann2018-06-141-1/+1
| * | | | | | | | Makes the html attribute in the json output optional with the option html_ren...Tim Zallmann2018-06-141-0/+18
* | | | | | | | | Merge branch 'fix-flakey-remove-deploy-key-spec' into 'master'Rémy Coutable2018-06-151-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fix flakey time-sensitive remove deploy key specfix-flakey-remove-deploy-key-specEric Eastwood2018-06-141-1/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'fix-flakey-user-assignee-autocomplete-dropdown-specs' into 'mas...Douwe Maan2018-06-151-25/+26
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Update dropdown_assignee_spec with filtered_search_helpersfix-flakey-user-assignee-autocomplete-dropdown-specsEric Eastwood2018-06-141-19/+18
| * | | | | | | Fix flakey user/assignee autocomplete dropdownEric Eastwood2018-06-141-8/+10
| |/ / / / / /
View Lorry Controller Status