summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Add padding to target branch container33992-mr-target-avatarAnnabel Dunstone Gray2017-06-211-1/+1
* Merge branch 'backport-check-project-feature' into 'master'Douwe Maan2017-06-217-32/+20
|\
| * Use the new check_project_feature_available! method in project controllersNick Thomas2017-06-217-32/+13
| * Backport check_project_feature_available! from EENick Thomas2017-06-211-1/+8
* | Merge branch 'winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4d' into 'mas...Jacob Schatz2017-06-216-66/+26
|\ \
| * | Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4dwinh2017-06-216-66/+26
* | | Merge branch '34008-fix-CI_ENVIRONMENT_URL-2' into 'master'Kamil Trzciński2017-06-212-18/+25
|\ \ \
| * | | Memorize the value in methods rather than local34008-fix-CI_ENVIRONMENT_URL-2Lin Jen-Shin2017-06-211-6/+10
| * | | Expand with all the variables so that things likeLin Jen-Shin2017-06-212-19/+11
| * | | Move expanded_environment_url to CreateDeploymentServiceLin Jen-Shin2017-06-212-22/+21
| * | | Add comments to explain some culprit; Add changelogLin Jen-Shin2017-06-211-2/+9
| * | | Don't expand CI_ENVIRONMENT_URL so runner would doLin Jen-Shin2017-06-212-6/+11
| | |/ | |/|
* | | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-2174-328/+328
* | | Merge branch 'disable-environment-list-polling' into 'master'Grzegorz Bizon2017-06-211-2/+0
|\ \ \ | |_|/ |/| |
| * | Disable environment list polling as it breaks deployboardKamil Trzcinski2017-06-211-2/+0
| |/
* | Merge branch '33837-remove-trash-on-registry-image' into 'master'Rémy Coutable2017-06-211-7/+8
|\ \
| * | Remove registry image delete button if user cant delete itvanadium232017-06-211-7/+8
* | | Merge branch '33878-fix-edit-deploy-key' into 'master'Rémy Coutable2017-06-211-2/+2
|\ \ \ | |_|/ |/| |
| * | Fix edit button for deploy keys available from other projectsAlexander Randa2017-06-201-2/+2
* | | 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
| | |/ | |/|
* | | 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-2144-558/+584
|\ \ \
| * | | Bulk edit scroll fixBryce Johnson2017-06-213-5/+10
| |/ /
| * | Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'34013-names-with-spaces-break-issue-filter-barJacob Schatz2017-06-201-1/+1
| |\ \
| | * | Fix MR "Changes" diff note up arrow to edit last note33868-fix-mr-changes-diff-note-up-arrow-editingEric Eastwood2017-06-201-1/+1
| * | | Merge branch '30213-project-transfer-move-rollback' into 'master'Douwe Maan2017-06-201-40/+74
| |\ \ \
| | * | | Rollback project folder move after error in Projects::TransferService30213-project-transfer-move-rollbackJames Edwards-Jones2017-06-201-40/+74
| * | | | Merge branch 'fix-email-avatars' into 'master'Douwe Maan2017-06-203-8/+8
| |\ \ \ \
| | * | | | Fix avatar images in pipeline emailsfix-email-avatarsSean McGivern2017-06-203-8/+8
| * | | | | Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'Douwe Maan2017-06-201-14/+19
| |\ \ \ \ \
| | * | | | | Add view spec for more_actions_dropdown render branchesLuke "Jared" Bennett2017-06-161-18/+17
| | * | | | | [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-204-5/+5
| |\ \ \ \ \ \
| | * | | | | | Fix some incorrect usage of translation helpersfix-i18n-helpersRuben Davila2017-06-194-5/+5
| * | | | | | | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-205-47/+140
| |\ \ \ \ \ \ \
| | * | | | | | | Refactor GroupProjectsFinder#init_collectionYorick Peterse2017-06-194-38/+74
| | * | | | | | | Refactor Project.with_feature_available_for_userYorick Peterse2017-06-162-7/+26
| | * | | | | | | Refactor ProjectsFinder#init_collectionYorick Peterse2017-06-161-19/+57
| * | | | | | | | 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
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Uniformize code between both pipelines tablesFilipa Lacerda2017-06-2010-357/+246
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | 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
| * | | | | | | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-201-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-191-0/+4
| * | | | | | | | | Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-202-3/+3
| |\ \ \ \ \ \ \ \ \