summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add changelog entry34008-fix-CI_ENVIRONMENT_URLLin Jen-Shin2017-06-211-0/+4
* Make sure variables from environment is also usedLin Jen-Shin2017-06-212-16/+43
* 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
* | | | | | | Merge branch 'fix-i18n-helpers' into 'master'Douwe Maan2017-06-206-8/+26
|\ \ \ \ \ \ \
| * | | | | | | Fix some incorrect usage of translation helpersfix-i18n-helpersRuben Davila2017-06-196-8/+26
* | | | | | | | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-2010-59/+234
|\ \ \ \ \ \ \ \
| * | | | | | | | Refactor GroupProjectsFinder#init_collectionYorick Peterse2017-06-195-38/+106
| * | | | | | | | Refactor Project.with_feature_available_for_userYorick Peterse2017-06-163-7/+38
| * | | | | | | | Refactor ProjectsFinder#init_collectionYorick Peterse2017-06-164-31/+107
* | | | | | | | | Merge branch 'docs/subgroups-mysql' into 'master'Marcia Ramos2017-06-203-58/+53
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add link to issue for MySQL/subgroups drop supportAchilleas Pipinellis2017-06-202-2/+5
| * | | | | | | | | Mention limitations of MySQL in docsAchilleas Pipinellis2017-06-193-58/+50
* | | | | | | | | | Merge branch 'remove-changelog' into 'master'Clement Ho2017-06-201-4/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Remove changelog entryAnnabel Dunstone Gray2017-06-201-4/+0
* | | | | | | | | | Merge branch '33363-user-customize-callout-has-no-top-margin-on-projects-page...Annabel Dunstone Gray2017-06-203-4/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Resolve "User customize callout has no top-margin on projects page"Luke "Jared" Bennett2017-06-203-4/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'search-clear-button-center' into 'master'Annabel Dunstone Gray2017-06-201-3/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixed filtered search clear button being off-centersearch-clear-button-centerPhil Hughes2017-06-201-3/+0
* | | | | | | | | | | Merge branch '31349-async-buttons' into 'master'Phil Hughes2017-06-2016-443/+271
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Uniformize code between both pipelines tablesFilipa Lacerda2017-06-2016-443/+271
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '33260-allow-admins-to-list-admins' into 'master'Rémy Coutable2017-06-206-4/+53
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Re-instate is_admin flag in users API is current user is an adminMike Ricketts2017-06-206-4/+53
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqkushalpandya2017-06-201-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | / / / | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | Merge branch '33840-revert-sticky-confidential-header' into 'master'confidential-issues-revertClement Ho2017-06-204-37/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert sticky confidential headerAnnabel Dunstone Gray2017-06-204-37/+43
| | |_|/ / / / / / / | |/| | | | | | | |