summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix droplab related specsremove-droplab-object-assign-callsLuke "Jared" Bennett2017-05-113-52/+11
* Removed all instances of Object.assign by using es6 classes, also includes so...Luke "Jared" Bennett2017-05-115-212/+198
* Merge branch '32045-vue-warn-cannot-find-element-issuable-time-tracker' into ...Phil Hughes2017-05-111-42/+0
|\
| * Remove sidebar bundle spec32045-vue-warn-cannot-find-element-issuable-time-trackerClement Ho2017-05-101-42/+0
* | Merge branch 'issue_api_change' into 'master' Sean McGivern2017-05-111-0/+5
|\ \
| * | Issue API change: assignee_id parameter and assignee object in a responseissue_api_changeValery Sizov2017-05-111-0/+5
* | | Merge branch 'dm-auxiliary-viewers' into 'master' Sean McGivern2017-05-1132-140/+616
|\ \ \
| * | | Add changelogdm-auxiliary-viewersDouwe Maan2017-05-101-0/+5
| * | | Reset Repository#license memo when license file is changedDouwe Maan2017-05-102-8/+15
| * | | Implement auxiliary blob viewersDouwe Maan2017-05-1031-134/+598
* | | | Merge branch '32087-fix-flickering-system-notes' into 'master' Phil Hughes2017-05-111-0/+2
|\ \ \ \
| * | | | Fix flickering of system notes32087-fix-flickering-system-notesEric Eastwood2017-05-101-0/+2
* | | | | Merge branch '31625-tag-editor-loses-all-inputs-when-you-try-to-add-a-tag-tha...Phil Hughes2017-05-114-3/+10
|\ \ \ \ \
| * | | | | Keep input data after creating existing tagSam Rose2017-05-104-3/+10
* | | | | | Merge branch '32094-custom-notifications-model-aria-labelledby-incorrect' int...Phil Hughes2017-05-111-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix aria labels on custom notifications modal32094-custom-notifications-model-aria-labelledby-incorrectSam Rose2017-05-101-3/+3
* | | | | | Merge branch 'fix-shortcuts_spec-explore-page-transient-failure' into 'master' Douwe Maan2017-05-111-14/+17
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix `send_key` to `send_keys` and add EOF newlinefix-shortcuts_spec-explore-page-transient-failureLuke "Jared" Bennett2017-05-101-3/+3
| * | | | | Find the nothing-here-block before asserting page content when on explore pag...Luke "Jared" Bennett2017-05-101-15/+18
| | |/ / / | |/| | |
* | | | | Merge branch 'docs/hide-gcp-install' into 'master' Marcia Ramos2017-05-102-2/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into 'docs/hide-gcp-install'docs/hide-gcp-installAchilleas Pipinellis2017-05-10276-1218/+3853
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Hide GCP install guide from index page until our image is addedAchilleas Pipinellis2017-05-092-2/+4
* | | | | | Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot2017-05-1018-41/+152
|\ \ \ \ \ \
| * | | | | | Fix rubocop failureKamil Trzcinski2017-05-091-1/+1
| * | | | | | Make retried to be nullableKamil Trzcinski2017-05-096-14/+8
| * | | | | | Store retried in database for CI buildsretried-in-database-mysqlKamil Trzcinski2017-05-0718-41/+158
* | | | | | | Merge branch 'winh-pending-ajax-cache' into 'master' Clement Ho2017-05-102-38/+89
|\ \ \ \ \ \ \
| * | | | | | | Track pending requests in AjaxCacheWinnie Hellmann2017-05-102-38/+89
* | | | | | | | Merge branch 'enforce-current-user-usage-on-entities' into 'master' Kamil Trzciński2017-05-101-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove unnecessary user hash being passed to DeploymentSerializerenforce-current-user-usage-on-entitiesOswaldo Ferreira2017-05-101-1/+1
| * | | | | | | Ensure all Serializers receive `current_user` instead `user`Oswaldo Ferreira2017-05-101-1/+1
* | | | | | | | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'mas...Robert Speicher2017-05-10153-218/+217
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable the Style/TrailingCommaInArguments copRémy Coutable2017-05-1049-62/+60
| * | | | | | | | Enable the Style/TrailingCommaInLiteral copRémy Coutable2017-05-10113-156/+157
| |/ / / / / / /
* | | | | | | | Merge branch 'fix-api-headings' into 'master' Achilleas Pipinellis2017-05-1014-14/+14
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | update API doc with +API (h1 heading)Marcia Ramos2017-05-1014-14/+14
|/ / / / / / /
* | | | | | | Merge branch 'bvl-security-patches' into 'master' Robert Speicher2017-05-1056-311/+831
|\ \ \ \ \ \ \
| * | | | | | | Use new SnippetsFinder signature in APIbvl-security-patchesBob Van Landuyt2017-05-101-2/+2
| * | | | | | | Use `described_class` in SnippetsFinder-specBob Van Landuyt2017-05-101-21/+21
| * | | | | | | Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-108-19/+105
| * | | | | | | Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-105-3/+29
| * | | | | | | Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-1023-184/+399
| * | | | | | | Merge branch 'branch-name-escape' into 'security'Robert Speicher2017-05-101-0/+4
| * | | | | | | Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-103-3/+80
| * | | | | | | Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-104-12/+39
| * | | | | | | Merge branch 'rs-sanitize-submodule-urls' into 'security'Douwe Maan2017-05-103-16/+46
| * | | | | | | Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'Robert Speicher2017-05-104-56/+86
| * | | | | | | Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-107-17/+42
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '31474-issue-boards-sidebar-milestone-dropdown-should-not-be-mul...Phil Hughes2017-05-107-13/+97
|\ \ \ \ \ \ \
| * | | | | | | Disallow multiselect for Milestone dropdownSam Rose2017-05-107-13/+97