summaryrefslogtreecommitdiff
Commit message (Collapse)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
| | | | | | | Fixes ajax requests when current URL has a trailing slash Closes #27756 See merge request !9010
* Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into ↵Douwe Maan2017-02-155-13/+53
| | | | | | | | | | 'master' Make deploy key not show in User's keys list Closes #27480 See merge request !9024
* 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
| | | | | | | | | | Fix for XSS vulnerability in SVG attachments See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2059
* | Merge branch 'fix-github-import-MR-wrong-project' into 'security' Robert Speicher2017-02-132-3/+11
| | | | | | | | | | Fix labels being applied to wrong merge requests on GitHub import See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064
* | Merge branch 'fix-rdoc-xss' into 'security' Robert Speicher2017-02-133-0/+29
| | | | | | | | | | Fix XSS in rdoc and other markups See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2058
* | Merge branch 'asciidoctor-xss-patch' into 'security' Robert Speicher2017-02-133-0/+30
| | | | | | | | | | Add sanitization filter to asciidocs output to prevent XSS See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2057
| * 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
| | | | | | | | | | | | | | | | Fix timezone on issue boards due date Closes #27317 See merge request !9150
| * Merge branch '27755-pipeline-docs' into 'master' Achilleas Pipinellis2017-02-143-0/+30
| | | | | | | | | | | | | | Document types of pipelines Closes #22631 See merge request !9008
| * Merge branch '27656-doc-ci-enable-ci' into 'master' Achilleas Pipinellis2017-02-144-9/+13
| | | | | | | | | | | | | | Update doc for enabling or disabling GitLab CI Closes #27656 See merge request !8965
| * Merge branch 'fix-ar-connection-leaks' into 'master'Rémy Coutable2017-02-143-1/+11
| | | | | | | | | | | | | | Fix ActiveRecord connection leaks Closes #27949 and gitlab-com/infrastructure#1139 See merge request !9109
| * Merge branch '27966-branch-ref-switcher-input-filter-broken' into 'master' Filipa Lacerda2017-02-144-3/+17
| | | | | | | | | | | | | | Display loading indicator when filtering ref switcher dropdown Closes #27966 See merge request !9144
| * Merge branch '27395-reduce-group-activity-sql-queries' into 'master' Yorick Peterse2017-02-144-14/+21
| | | | | | | | | | | | | | Resolve "GroupsController#activity.json is REALLY slow due to SQL" Closes #27395 See merge request !9088
| * Merge branch 'dm-quick-fix-web-edit-new-lines' into 'master' Robert Speicher2017-02-142-0/+19
| | | | | | | | | | | | | | Respect autocrlf setting when creating/updating file through web UI Closes gitlab-com/www-gitlab-com#1152 See merge request !9198
| * Merge branch 'sh-add-labels-index' into 'master' Yorick Peterse2017-02-143-0/+18
| | | | | | | | | | | | | | Add indices to improve loading of labels page Closes #25413 See merge request !9121
| * Merge branch '27939-fix-current-build-arrow' into 'master' Filipa Lacerda2017-02-143-1/+9
| | | | | | | | | | | | | | Fix current build arrow Closes #27939 See merge request !9154
| * Merge branch 'issue-boards-docs-update' into 'master' Achilleas Pipinellis2017-02-146-24/+27
| | | | | | | | | | | | | | Updated issue boards docs Closes #27872 See merge request !9097
| * Merge branch '28032-tooltips-file-name' into 'master'Annabel Dunstone Gray2017-02-142-4/+9
| | | | | | | | | | | | | | | | Adds container to tooltip in order to make it work with overflow:hidden in parent element Closes #28032 See merge request !9170
| * Merge branch '28034-icon-in-issue-search-dropdown-still-animates' into 'master'Annabel Dunstone Gray2017-02-142-2/+3
| | | | | | | | | | | | | | Resolve "Icon in issue search dropdown still animates" Closes #28034 See merge request !9156
| * Merge branch ↵Annabel Dunstone Gray2017-02-142-2/+10
| | | | | | | | | | | | | | | | | | | | '27947-missing-margin-between-loading-icon-and-text-in-merge-request-widget' into 'master' Resolve "Missing margin between loading icon and text in Merge Request Widget" Closes #27947 See merge request !9119
| * Merge branch 'docs/merge_requests_index' into 'master' Achilleas Pipinellis2017-02-144-180/+178
| | | | | | | | | | Move merge requests index file inside the merge_requests dir See merge request !9181
| * Merge branch '28029-improve-blockquote-formatting-on-emails' into 'master'Annabel Dunstone Gray2017-02-142-0/+11
| | | | | | | | | | | | | | Resolve "Improve blockquote formatting in notification emails" Closes #28029 See merge request !9157
| * Merge branch '27987-skipped-pipeline-mr-graph' into 'master' Alfredo Sumaran2017-02-142-2/+7
| | | | | | | | | | | | | | Only show MR widget graph if there are stages Closes #27987 See merge request !9141
| * Merge branch 'replace-teaspoon-references' into 'master' Clement Ho2017-02-144-22/+15
| | | | | | | | | | | | | | Replace teaspoon references with Karma Closes gitlab-com/gitlab-docs#68 See merge request !9011
| * Merge branch 'fix-job-to-pipeline-renaming' into 'master'Douwe Maan2017-02-145-7/+11
| | | | | | | | | | | | | | Fix job to pipeline renaming Closes #28016 See merge request !9147
| * Merge branch 'rs-warden-blocked-users' into 'master' Robert Speicher2017-02-1411-76/+54
| | | | | | | | | | | | | | Don't perform Devise trackable updates on blocked User records Closes #27519 See merge request !8915
| * Merge branch 'sh-add-index-to-ci-trigger-requests' into 'master' Yorick Peterse2017-02-143-1/+18
| | | | | | | | | | Add index to ci_trigger_requests for commit_id See merge request !9124
| * Merge branch '27991-success-with-warnings-caret' into 'master' Alfredo Sumaran2017-02-142-7/+4
| | | | | | | | | | | | | | Remove orange caret icon from MR widget Closes #27991 See merge request !9137
| * Merge branch 'user-dropdown-settings' into 'master' Alfredo Sumaran2017-02-141-1/+1
| | | | | | | | | | Make min width smaller for user settings See merge request !9112
| * Merge branch 'issue_27855' into 'master' Rémy Coutable2017-02-141-5/+6
| | | | | | | | | | | | | | Fix admin_labels_spec.rb transient failure Closes #27855 See merge request !9135
| * Merge branch '27955-mr-notification-use-pipeline-language' into 'master' Filipa Lacerda2017-02-142-2/+6
| | | | | | | | | | | | | | Show Pipeline(not Job) in MR CI status desktop notification Closes #27955 See merge request !9122
| * Merge branch 'upgrade-webpack-v2.2' into 'master' Alfredo Sumaran2017-02-144-20/+35
| | | | | | | | | | Upgrade to webpack v2.2.1 See merge request !9078
| * Merge branch '27943-contribution-list-on-profile-page-is-aligned-right' into ↵Annabel Dunstone Gray2017-02-142-0/+6
| | | | | | | | | | | | | | | | | | | | 'master' Fix contribution activity alignment Closes #27943 See merge request !9101
| * Merge branch 'build-notification-null' into 'master' Filipa Lacerda2017-02-141-1/+1
| | | | | | | | | | | | | | Adds a null check to build notifications Closes #27948 See merge request !9108
| * Merge branch 'upgrade-babel-v6' into 'master' Alfredo Sumaran2017-02-146-10/+19
| | | | | | | | | | Upgrade from Babel 5 to Babel 6 See merge request !9072
| * Merge branch 'diff-notes-refactor' into 'master' Filipa Lacerda2017-02-1411-67/+52
| | | | | | | | | | Refactored diff notes Vue app See merge request !9065
| * Merge branch 'dm-copy-as-gfm-anchor-link' into 'master' Douwe Maan2017-02-142-0/+5
| | | | | | | | | | Correctly transform an anchor link to GFM when copying it See merge request !9080
| * Merge branch 'mr-widget-pipelines' into 'master' Fatih Acet2017-02-141-0/+6
| | | | | | | | | | Reduce padding of mr widget mini graph See merge request !9071
| * Merge branch '27880-pipelines-table-not-showing-commit-branch' into 'master' Clement Ho2017-02-143-3/+11
| | | | | | | | | | | | | | Looks for correct key to pass to commit prop. Adds rspec test. Closes #27880 See merge request !9070
| * Merge branch 'widget-spec-failure' into 'master' Sean McGivern2017-02-141-2/+0
| | | | | | | | | | | | | | Fixed random merge request widget failure Closes #27806 See merge request !9068
| * Merge branch 'backport-ee-build-fixes' into 'master' Filipa Lacerda2017-02-143-1/+15
| | | | | | | | | | | | | | Backport fixes for pipelines_store frontend specs Closes #27871 See merge request !9067
| * Merge branch 'pages-0.3.0' into 'master' Robert Speicher2017-02-141-1/+1
| | | | | | | | | | Update GitLab pages to v0.3.0 See merge request !9043
| * Merge branch 'lfs-noauth-public-repo' into 'master'Rémy Coutable2017-02-143-0/+9
| | | | | | | | | | | | | | lfs: do not require auth for public repositories Closes #23360 See merge request !8824
| * Merge branch 'no-backlog-help' into '8-17-stable' Filipa Lacerda2017-02-1414-10/+179
| |\ |/ / | | | | | | Added help box where backlog list used to be See merge request !9106
| * Fixed modal specsPhil Hughes2017-02-141-0/+4
| |
View Lorry Controller Status