summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update Prometheus vendor YML for 2.1 supportupdate-prometheus-vendor-ymlJoshua Lambert2018-02-151-77/+59
* Merge branch 'dm-git-hook-popen' into 'master'Stan Hu2018-02-141-8/+14
* Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master'Stan Hu2018-02-141-1/+1
* Merge branch 'fix-migration-timestamp' into 'master'Stan Hu2018-02-141-0/+21
* Merge branch 'dm-user-namespace-route-path-validation' into 'master'Sean McGivern2018-02-146-16/+36
* Merge branch 'bvl-fix-500-on-fork-without-restricted-visibility-levels' into ...Douwe Maan2018-02-143-1/+15
* Merge branch '42696-gitlab-import-leaves-group_id-on-projectlabel' into 'master'Stan Hu2018-02-146-4/+50
* Merge branch 'winh-new-branch-dropdown-style' into 'master'Phil Hughes2018-02-1410-139/+135
* Merge branch '42160-error-500-loading-merge-request-undefined-method-index-fo...Douwe Maan2018-02-143-0/+17
* Merge branch 'sh-fix-jira-trailing-slash' into 'master'Robert Speicher2018-02-143-1/+29
* Merge branch 'remove_ldap_person_validation' into 'master'Stan Hu2018-02-143-24/+5
* Merge branch '42591-update-nokogiri' into 'master'Stan Hu2018-02-073-3/+8
* Update VERSION to 10.4.3v10.4.3Luke Bennett2018-02-051-1/+1
* Update CHANGELOG.md for 10.4.3Luke Bennett2018-02-055-20/+10
* Revert change to schema versionRobert Speicher2018-02-021-1/+1
* Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'Kamil Trzciński2018-02-025-9/+25
* Merge branch 'fix-mermaid-xss' into 'security-10-4'Douwe Maan2018-01-3110-16/+131
* Merge branch 'fix/gh-namespace-issue' into 'security-10-4'James Lopez2018-01-317-30/+88
* Merge branch 'security-10-4-todo-api-reveals-sensitive-information' into 'sec...Robert Speicher2018-01-315-2/+19
* Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibil...Douwe Maan2018-01-319-75/+410
* Update VERSION to 10.4.2v10.4.2Mark Fletcher2018-01-301-1/+1
* Update CHANGELOG.md for 10.4.2Mark Fletcher2018-01-308-36/+16
* Merge branch 'vendor-auto-devops-template-in-10-4' into '10-4-stable'Robert Speicher2018-01-302-3/+34
|\
| * Fix invalid changelog YAMLRobert Speicher2018-01-291-0/+0
| * Add changelogvendor-auto-devops-template-in-10-4Fabio Busatto2018-01-291-0/+5
| * Update Auto-DevOps.gitlab-ci.ymlFabio Busatto2018-01-241-3/+29
* | Merge branch '10-4-stable-patch-2' into '10-4-stable'Robert Speicher2018-01-3027-62/+255
|\ \
| * | Merge branch '42022-allow-users-to-request-access-not-visible-when-project-vi...10-4-stable-patch-2Fatih Acet2018-01-292-1/+6
| * | Merge branch 'fix-local-rspec-tests' into 'master'Mike Greiling2018-01-291-1/+1
| * | Merge branch '42327-import-from-gitlab-com-fails-destination-already-exists-a...Douwe Maan2018-01-2911-8/+53
| * | Merge branch '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-...Rémy Coutable2018-01-293-2/+30
| * | Merge branch 'fix-postgresql-table-grant' into 'master'Stan Hu2018-01-292-20/+35
| * | Merge branch 'fj-42112-fix-deploy-keys-migration-mysql' into 'master'Stan Hu2018-01-293-28/+111
| * | Merge branch '32546-cannot-copy-paste-on-ios' into 'master'Phil Hughes2018-01-292-0/+12
| * | Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-293-2/+7
|/ /
* | Update VERSION to 10.4.1v10.4.1Robert Speicher2018-01-241-1/+1
* | Update CHANGELOG.md for 10.4.1Robert Speicher2018-01-247-32/+15
|/
* Merge branch '10-4-stable-patch-1' into '10-4-stable'Luke Bennett2018-01-2480-191/+932
|\
| * Merge branch '42361-workaround' into 'master'10-4-stable-patch-1Robert Speicher2018-01-241-0/+3
| * Resolve conflict for secret management on Auto-DevOpsMayra Cabrera2018-01-231-3/+0
| * Merge branch 'vendor-10-4-auto-devops-template' into 'master'Marin Jankovski2018-01-231-0/+5
| * Merge branch '42119-non-triggered' into 'master'Grzegorz Bizon2018-01-233-8/+27
| * Merge branch '40612-cannot-change-project-visibility-from-private-even-when-o...Robert Speicher2018-01-234-6/+28
| * fix failures for loading_icon.vueJacob Schatz2018-01-221-2/+0
| * resolve repo_commit_section.vueJacob Schatz2018-01-221-39/+1
| * resolve conflicts in loading_icon.vueJacob Schatz2018-01-221-4/+1
| * resolves changes in app.vueJacob Schatz2018-01-221-57/+18
| * Merge branch 'fix-description-loss' into 'master'Phil Hughes2018-01-222-0/+90
| * Merge branch 'tz-fix-ide-bugs' into 'master'Phil Hughes2018-01-2225-76/+211
| * Merge branch 'docs/dast-cleanup' into 'master'Marcia Ramos2018-01-221-8/+13