summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rebuild the dynamic path before validating itbvl-validate-path-updateBob Van Landuyt2017-06-213-9/+18
* Merge branch '33837-remove-trash-on-registry-image' into 'master'Rémy Coutable2017-06-212-7/+12
|\
| * Remove registry image delete button if user cant delete itvanadium232017-06-212-7/+12
* | Merge branch 'replase_spinach_spec_create.feature' into 'master'Rémy Coutable2017-06-213-14/+31
|\ \
| * | Replace 'create.feature' spinach test with an rspec analogblackst0ne2017-06-213-14/+31
* | | Merge branch 'add-index-for-head-pipeline-id' into 'master'Yorick Peterse2017-06-212-1/+17
|\ \ \
| * | | Add index for head pipeline idadd-index-for-head-pipeline-idKamil Trzcinski2017-06-212-1/+17
| |/ /
* | | Merge branch 'zj-environment-creation-regex-fix' into 'master'Grzegorz Bizon2017-06-213-2/+14
|\ \ \
| * | | Replace invalid chars while seeding environmentsZeger-Jan van de Weg2017-06-213-2/+14
|/ / /
* | | Merge branch '33878-fix-edit-deploy-key' into 'master'Rémy Coutable2017-06-215-3/+34
|\ \ \ | |/ / |/| |
| * | Fix edit button for deploy keys available from other projectsAlexander Randa2017-06-205-3/+34
* | | Merge branch 'docs/fix-broken-links' into 'master'Rémy Coutable2017-06-211-1/+1
|\ \ \
| * | | Fix broken relative URL in prometheus docsAchilleas Pipinellis2017-06-211-1/+1
|/ / /
* | | Update CHANGELOG.md for 9.2.7Timothy Andrew2017-06-212-4/+4
* | | Merge branch '34017-common-vue' into 'master'Tim Zallmann2017-06-212-3/+6
|\ \ \
| * | | Remove vue from main.bundle.js file being loaded through `app/assets/javascri...34017-common-vueFilipa Lacerda2017-06-212-3/+6
| | |/ | |/|
* | | Merge branch 'dt/printing-to-api' into 'master'Rémy Coutable2017-06-214-0/+10
|\ \ \
| * | | add printing_merge_request_link_enabled to APIDavid Turner2017-06-194-0/+10
* | | | Merge branch 'gitaly-auth-token' into 'master'Sean McGivern2017-06-2112-43/+77
|\ \ \ \
| * | | | Enable gitaly token auth when testingJacob Vosmaer2017-06-203-2/+5
| * | | | Rubocop and comment fixesJacob Vosmaer2017-06-203-5/+7
| * | | | Send gitaly token to workhorse when neededJacob Vosmaer2017-06-202-4/+13
| * | | | Pass Gitaly token on Ruby gRPC requestsJacob Vosmaer2017-06-198-37/+57
* | | | | Merge branch 'remove-git-commit-attribute' into 'master'Sean McGivern2017-06-211-1/+1
|\ \ \ \ \
| * | | | | Remove unused attr_accessor from Gitlab::Git::CommitJacob Vosmaer2017-06-201-1/+1
| |/ / / /
* | | | | Merge branch '33502-make-gitlab-project-issue-description-templates-less-spec...Rémy Coutable2017-06-212-1/+14
|\ \ \ \ \
| * | | | | Mention both CE and EE issue trackers in description templatesMark Fletcher2017-06-212-1/+14
| | |_|/ / | |/| | |
* | | | | Merge branch 'sh-current-settings-autoload-fix' into 'master'Rémy Coutable2017-06-211-5/+5
|\ \ \ \ \
| * | | | | Change references from ApplicationSetting to ::ApplicationSetting to make aut...sh-current-settings-autoload-fixStan Hu2017-06-201-5/+5
| |/ / / /
* | | | | Merge branch '33942-cross-reference-icon-no-longer-visible-in-normal-sidebar'...Phil Hughes2017-06-210-0/+0
|\ \ \ \ \
| * | | | | Fixes scrolling + improves Performance through assigning found $ elements to ...33942-cross-reference-icon-no-longer-visible-in-normal-sidebarTim Zallmann2017-06-202-7/+16
* | | | | | Merge branch '33693-protected-branch-dropdowns-cut-off-in-repository-settings...Phil Hughes2017-06-212-4/+25
|\ \ \ \ \ \
| * | | | | | Resolve "Protected branch dropdowns cut-off in Repository Settings page"Luke "Jared" Bennett2017-06-212-4/+25
|/ / / / / /
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceTim Zallmann2017-06-2197-832/+1296
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'bulk-edit-scroll-fix' into 'master'Phil Hughes2017-06-214-5/+29
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Bulk edit scroll fixBryce Johnson2017-06-214-5/+29
| |/ / / / /
| * | | | | Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'34013-names-with-spaces-break-issue-filter-barJacob Schatz2017-06-203-33/+78
| |\ \ \ \ \
| | * | | | | Fix MR "Changes" diff note up arrow to edit last note33868-fix-mr-changes-diff-note-up-arrow-editingEric Eastwood2017-06-203-33/+78
| * | | | | | Merge branch '30213-project-transfer-move-rollback' into 'master'Douwe Maan2017-06-203-40/+139
| |\ \ \ \ \ \
| | * | | | | | Rollback project folder move after error in Projects::TransferService30213-project-transfer-move-rollbackJames Edwards-Jones2017-06-203-40/+139
| * | | | | | | Merge branch '33344-add-rails-i18n' into 'master'Douwe Maan2017-06-202-0/+5
| |\ \ \ \ \ \ \
| | * | | | | | | Add rails-i18n for some common translations33344-add-rails-i18nLin Jen-Shin2017-06-202-0/+5
| * | | | | | | | Merge branch 'delete-fix-missing-function-changelog' into 'master'Stan Hu2017-06-201-4/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Deleted "fix-missing-function-dropzone-input.yml" from the changelogJose Ivan Vargas2017-06-201-4/+0
| * | | | | | | | | Merge branch 'bugfix/html-email-brackets' into 'master'Douwe Maan2017-06-204-0/+41
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | add a changelog for the email parsing bugbugfix/html-email-bracketshttp://jneen.net/2017-06-191-0/+4
| | * | | | | | | | | unwrap all links with no hrefhttp://jneen.net/2017-06-191-0/+7
| | * | | | | | | | | add a spec for no-href link parsinghttp://jneen.net/2017-06-192-0/+30
| * | | | | | | | | | Merge branch '28517-discover-by-userid' into 'master'Douwe Maan2017-06-201-3/+8
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Allow discover by userid - issue 28517Matt Walsh2017-06-201-3/+8