summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mc/bug/38984-wildcard-protected-tags' into 'security-10-4'Kamil Trzciński2018-02-021-1/+4
* Merge branch 'fix-mermaid-xss' into 'security-10-4'Douwe Maan2018-01-311-0/+3
* Merge branch 'fix/gh-namespace-issue' into 'security-10-4'James Lopez2018-01-313-21/+15
* Merge branch 'security-10-4-25223-snippets-finder-doesnt-obey-feature-visibil...Douwe Maan2018-01-313-22/+67
* Merge branch '42022-allow-users-to-request-access-not-visible-when-project-vi...10-4-stable-patch-2Fatih Acet2018-01-291-1/+1
* 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-296-4/+21
* Merge branch '32546-cannot-copy-paste-on-ios' into 'master'Phil Hughes2018-01-291-0/+7
* Merge branch 'fix-cache-clear-windows' into 'master'Kamil Trzciński2018-01-291-1/+1
* Merge branch '42119-non-triggered' into 'master'Grzegorz Bizon2018-01-232-5/+10
* Merge branch '40612-cannot-change-project-visibility-from-private-even-when-o...Robert Speicher2018-01-231-0/+2
* 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-221-0/+57
* Merge branch 'tz-fix-ide-bugs' into 'master'Phil Hughes2018-01-2220-56/+190
* Merge branch '42225-mr-icons' into 'master'Phil Hughes2018-01-2211-11/+11
* Merge branch 'bvl-parent-preloading' into 'master'Douwe Maan2018-01-222-14/+33
* Merge branch 'issue_37143_2' into 'master'Sean McGivern2018-01-223-2/+8
* Merge branch 'mk-delete-orphaned-routes-before-validation' into 'master'Stan Hu2018-01-221-0/+12
* Fixes incorrect resolution for applications.vue file10-4-stable-prepare-rc8Mayra Cabrera2018-01-181-1/+1
* Fix incorrect conflict resolution for cluster JSEric Eastwood2018-01-181-0/+2
* Merge branch 'remove-ide-pref' into 'master'Tim Zallmann2018-01-181-17/+0
* Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'Jacob Schatz2018-01-181-1/+5
* Merge branch 'remove-soft-removals' into 'master'Douwe Maan2018-01-1810-22/+13
* Fix badly solved conflicts10-4-stable-prepare-rc7Filipa Lacerda2018-01-172-2/+3
* fixed eslintPhil Hughes2018-01-171-1/+1
* Merge branch '10-4-stable-prepare-rc7' of https://gitlab.com/gitlab-org/gitla...Luke Bennett2018-01-172-3/+3
|\
| * Merge branch '42046-fork-icon' into 'master'Fatih Acet2018-01-172-3/+3
* | Merge branch 'mr-status-box-update' into 'master'Filipa Lacerda2018-01-172-5/+6
|/
* Merge branch '41727-target-branch-name' into 'master'Sean McGivern2018-01-171-0/+1
* Merge branch '41874-closed-todo' into 'master'Douwe Maan2018-01-175-16/+21
* Merge branch 'sh-remove-import-retry-count-warning' into 'master'Robert Speicher2018-01-171-2/+2
* Merge branch 'mk-fix-permanent-redirect-validation' into 'master'Douwe Maan2018-01-171-1/+1
* Correct applications.vue conflict?Luke Bennett2018-01-171-27/+23
* Merge branch '41797-prometheus-wording-fixes' into 'master'Kamil Trzciński2018-01-171-24/+27
* Merge branch 'jej/backport-authorized-keys-to-ce' into 'master'Douwe Maan2018-01-173-0/+18
* Merge branch '10-4-stable-prepare-rc6' into '10-4-stable'10-4-stable-with-rc5-and-rc6LUKE BENNETT2018-01-1717-29/+41
|\
| * Merge branch '41937-vue-prop-type' into 'master'Phil Hughes2018-01-151-1/+5
| * Merge branch '41970-job-play-button' into 'master'Kamil Trzciński2018-01-152-6/+6
| * Merge branch 'projects-dropdown-perf' into 'master'Filipa Lacerda2018-01-151-5/+2
| * Merge branch 'disable-pages-on-jobs' into 'master'Yorick Peterse2018-01-152-2/+2
| * Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' i...Grzegorz Bizon2018-01-151-6/+2
| * Merge branch 'merge-request-lfs-badge' into 'master'Douwe Maan2018-01-151-0/+3
| * Merge branch 'fix/sidebar-collapse-button-spacing' into 'master'Phil Hughes2018-01-151-1/+0
| * Merge branch '41789-fix-up-web-ide-user-preference-copy-and-buttons' into 'ma...Tim Zallmann2018-01-154-5/+3
| * Merge branch 'sh-fix-bare-import-hooks' into 'master'James Lopez2018-01-151-0/+4
| * Merge branch '41491-fix-nil-blob-name-error' into 'master'Annabel Dunstone Gray2018-01-153-3/+14
* | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-151-0/+9