summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update VERSION to 8.17.0-rc3v8.17.0-rc3James Lopez2017-02-151-1/+1
* Merge branch '27756-fix-json-404-response' into 'master' Clement Ho2017-02-154-5/+28
* Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into '...Douwe Maan2017-02-155-13/+53
* Merge remote-tracking branch 'origin/8-17-stable' into 8-17-stableRobert Speicher2017-02-14122-477/+841
|\
| * Merge 'dev/8-17-stable' into 8-17-stableRuben Davila2017-02-1415-7/+113
| |\ | |/ |/|
* | Update VERSION to 8.17.0-rc2v8.17.0-rc2Robert Speicher2017-02-141-1/+1
* | Fix migration with missing DOWNTIME entryRuben Davila2017-02-131-0/+2
* | Merge branch 'svg-xss-fix' into 'security' Robert Speicher2017-02-135-3/+40
* | Merge branch 'fix-github-import-MR-wrong-project' into 'security' Robert Speicher2017-02-132-3/+11
* | Merge branch 'fix-rdoc-xss' into 'security' Robert Speicher2017-02-133-0/+29
* | Merge branch 'asciidoctor-xss-patch' into 'security' Robert Speicher2017-02-133-0/+30
| * Remove extra CRLF at the end of the lineRuben Davila2017-02-141-1/+1
| * Merge branch 'issue_27317' into 'master'Alfredo Sumaran2017-02-142-1/+6
| * Merge branch '27755-pipeline-docs' into 'master' Achilleas Pipinellis2017-02-143-0/+30
| * Merge branch '27656-doc-ci-enable-ci' into 'master' Achilleas Pipinellis2017-02-144-9/+13
| * Merge branch 'fix-ar-connection-leaks' into 'master'Rémy Coutable2017-02-143-1/+11
| * Merge branch '27966-branch-ref-switcher-input-filter-broken' into 'master' Filipa Lacerda2017-02-144-3/+17
| * Merge branch '27395-reduce-group-activity-sql-queries' into 'master' Yorick Peterse2017-02-144-14/+21
| * Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-142-0/+19
| * Merge branch 'sh-add-labels-index' into 'master' Yorick Peterse2017-02-143-0/+18
| * Merge branch '27939-fix-current-build-arrow' into 'master' Filipa Lacerda2017-02-143-1/+9
| * Merge branch 'issue-boards-docs-update' into 'master' Achilleas Pipinellis2017-02-146-24/+27
| * Merge branch '28032-tooltips-file-name' into 'master'Annabel Dunstone Gray2017-02-142-4/+9
| * Merge branch '28034-icon-in-issue-search-dropdown-still-animates' into 'master'Annabel Dunstone Gray2017-02-142-2/+3
| * Merge branch '27947-missing-margin-between-loading-icon-and-text-in-merge-req...Annabel Dunstone Gray2017-02-142-2/+10
| * Merge branch 'docs/merge_requests_index' into 'master' Achilleas Pipinellis2017-02-144-180/+178
| * Merge branch '28029-improve-blockquote-formatting-on-emails' into 'master'Annabel Dunstone Gray2017-02-142-0/+11
| * Merge branch '27987-skipped-pipeline-mr-graph' into 'master' Alfredo Sumaran2017-02-142-2/+7
| * Merge branch 'replace-teaspoon-references' into 'master' Clement Ho2017-02-144-22/+15
| * Merge branch 'fix-job-to-pipeline-renaming' into 'master'Douwe Maan2017-02-145-7/+11
| * Merge branch 'rs-warden-blocked-users' into 'master' Robert Speicher2017-02-1411-76/+54
| * Merge branch 'sh-add-index-to-ci-trigger-requests' into 'master' Yorick Peterse2017-02-143-1/+18
| * Merge branch '27991-success-with-warnings-caret' into 'master' Alfredo Sumaran2017-02-142-7/+4
| * Merge branch 'user-dropdown-settings' into 'master' Alfredo Sumaran2017-02-141-1/+1
| * Merge branch 'issue_27855' into 'master' Rémy Coutable2017-02-141-5/+6
| * Merge branch '27955-mr-notification-use-pipeline-language' into 'master' Filipa Lacerda2017-02-142-2/+6
| * Merge branch 'upgrade-webpack-v2.2' into 'master' Alfredo Sumaran2017-02-144-20/+35
| * Merge branch '27943-contribution-list-on-profile-page-is-aligned-right' into ...Annabel Dunstone Gray2017-02-142-0/+6
| * Merge branch 'build-notification-null' into 'master' Filipa Lacerda2017-02-141-1/+1
| * Merge branch 'upgrade-babel-v6' into 'master' Alfredo Sumaran2017-02-146-10/+19
| * Merge branch 'diff-notes-refactor' into 'master' Filipa Lacerda2017-02-1411-67/+52
| * Merge branch 'dm-copy-as-gfm-anchor-link' into 'master' Douwe Maan2017-02-142-0/+5
| * Merge branch 'mr-widget-pipelines' into 'master' Fatih Acet2017-02-141-0/+6
| * Merge branch '27880-pipelines-table-not-showing-commit-branch' into 'master' Clement Ho2017-02-143-3/+11
| * Merge branch 'widget-spec-failure' into 'master' Sean McGivern2017-02-141-2/+0
| * Merge branch 'backport-ee-build-fixes' into 'master' Filipa Lacerda2017-02-143-1/+15
| * Merge branch 'pages-0.3.0' into 'master' Robert Speicher2017-02-141-1/+1
| * Merge branch 'lfs-noauth-public-repo' into 'master'Rémy Coutable2017-02-143-0/+9
| * Merge branch 'no-backlog-help' into '8-17-stable' Filipa Lacerda2017-02-1414-10/+179
| |\ |/ /
| * Fixed modal specsPhil Hughes2017-02-141-0/+4