summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix notes form styling33917-mr-comment-system-note-highlight-don-t-have-the-same-widthMike Greiling2017-06-213-13/+21
* fix margins in diff discussions and threaded discussionsMike Greiling2017-06-211-10/+14
* set $note-icon-gutter-width as a variableMike Greiling2017-06-212-3/+4
* fix margin in xs viewportsMike Greiling2017-06-211-2/+2
* make timeline note margins more consistentMike Greiling2017-06-211-21/+25
* Merge branch 'bvl-validate-path-update' into 'master'Douwe Maan2017-06-213-9/+18
|\
| * Rebuild the dynamic path before validating itbvl-validate-path-updateBob Van Landuyt2017-06-213-9/+18
* | 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 'fix/gb/improve-autocancel-pipelines-migraton' into 'master'Kamil Trzciński2017-06-211-0/+2
|\ \ \
| * | | Disable statement timeout in CI pipelines migrationfix/gb/improve-autocancel-pipelines-migratonGrzegorz Bizon2017-06-191-0/+2
* | | | Merge branch 'winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4d' into 'mas...Jacob Schatz2017-06-2110-262/+111
|\ \ \ \
| * | | | Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4dwinh2017-06-2110-262/+111
| | |_|/ | |/| |
* | | | Merge branch '34008-fix-CI_ENVIRONMENT_URL-2' into 'master'Kamil Trzciński2017-06-215-55/+95
|\ \ \ \
| * | | | 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-213-20/+31
| * | | | Move expanded_environment_url to CreateDeploymentServiceLin Jen-Shin2017-06-214-58/+57
| * | | | Add comments to explain some culprit; Add changelogLin Jen-Shin2017-06-212-2/+13
| * | | | Don't expand CI_ENVIRONMENT_URL so runner would doLin Jen-Shin2017-06-213-9/+24
* | | | | Merge branch 'rubocop/gb/enable-dot-position-cop-leading-style' into 'master'Rémy Coutable2017-06-21359-2849/+2844
|\ \ \ \ \
| * | | | | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-21359-2849/+2844
|/ / / / /
* | | | | Merge branch 'disable-environment-list-polling' into 'master'Grzegorz Bizon2017-06-213-4/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Disable environment list polling as it breaks deployboardKamil Trzcinski2017-06-213-4/+8
| | |_|/ | |/| |
* | | | 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
| | |_|/ / / | |/| | | |