summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add missing link in Redis HA source docsdocs/add-missing-linkAchilleas Pipinellis2017-06-211-0/+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
| * | | | | | | | | Merge branch 'fix-email-avatars' into 'master'Douwe Maan2017-06-204-39/+68
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix avatar images in pipeline emailsfix-email-avatarsSean McGivern2017-06-204-39/+68
| | |/ / / / / / / /
| * | | | | | | | | Merge branch '33922-add-ruby-metrics-documentation' into 'master'Achilleas Pipinellis2017-06-203-2/+57
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add Prometheus metrics documentation33922-add-ruby-metrics-documentationJoshua Lambert2017-06-193-2/+57
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'Douwe Maan2017-06-204-31/+67
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Remove PersonalSnippet case for reportable_note specshide-edit-comment-and-report-as-abuse-conditionallyLuke "Jared" Bennett2017-06-202-40/+8
| | * | | | | | | | | Fixed reportable_note_shared_example for the reportable_note/snippets_specLuke "Jared" Bennett2017-06-162-15/+37
| | * | | | | | | | | Pass more_actions_dropdown vie spec locals to render call instead of stubbing...Luke "Jared" Bennett2017-06-161-44/+15
| | * | | | | | | | | Add view spec for more_actions_dropdown render branchesLuke "Jared" Bennett2017-06-162-18/+87
| | * | | | | | | | | [ci skip] Correct rendering more actions dropdown when there are no actions a...Luke "Jared" Bennett2017-06-161-2/+6
| | * | | | | | | | | Correct 'report as abuse' nesting in _more_actions_dropdown.html.hamlLuke "Jared" Bennett2017-06-161-4/+4
| | * | | | | | | | | Update _more_actions_dropdown.html.haml to only show 'Edit comment' when user...Luke "Jared" Bennett2017-06-161-5/+7