summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added checks for field before field.length and removed unneeded fieldNamehotfix-gl-dropdown-field-undefinedLuke Bennett2016-09-201-12/+13
|
* Merge branch 'issue_20078' into 'master' Yorick Peterse2016-09-202-0/+14
|\ | | | | | | | | Test if issue authors can access private projects See merge request !6419
| * Test if issue authors can access private projectsFelipe Artur2016-09-202-0/+14
| |
* | Merge branch 'doc/cycle-analytics' into 'master' Achilleas Pipinellis2016-09-203-0/+113
|\ \ | | | | | | | | | | | | | | | | | | Add docs on Cycle Analytics Document Cycle Analytics first iteration https://gitlab.com/gitlab-org/gitlab-ce/issues/21170 See merge request !6437
| * | Add docs on Cycle AnalyticsAchilleas Pipinellis2016-09-203-0/+113
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'slash-commands-load-fix' into 'master' Robert Speicher2016-09-204-3/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed slash commands not loading ## What does this MR do? Fixes an issue with slash commands not working when the autocomplete source is loading & then the new issue button is clicked. This also fixes an issue where the autocomplete source is loaded on pages where it isn't actually needed. ## What are the relevant issue numbers? Closes #21774, #21807 See merge request !6207
| * | | Moved loading GFM source into zen.html.hamlslash-commands-load-fixPhil Hughes2016-09-162-2/+3
| | | |
| * | | Use admin user in testsPhil Hughes2016-09-161-3/+1
| | | |
| * | | Fixed group milestone errorPhil Hughes2016-09-161-1/+1
| | | |
| * | | Correctly loads gfm autocomplete source on pages where it is requiredPhil Hughes2016-09-166-7/+27
| | | |
| * | | Fixed slash commands not loadingPhil Hughes2016-09-161-0/+4
| | | | | | | | | | | | | | | | Closes #21774
* | | | Merge branch 'update_issues_mr_counter' into 'master' Rémy Coutable2016-09-2019-60/+132
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix issues with wrong issues/merge request counts when filters are selected Closes #15356 plus counter for issues and MR are now displayed for the these paths `https://gitlab.com/groups/group-name/issues` `https://gitlab.com/groups/group-name/merge_requests` `https://gitlab.com/dashboard/issues` and `https://gitlab.com/dashboard/merge_requests` See merge request !4960
| * | | fix issues mr counterbarthc2016-09-2019-60/+132
| | | |
* | | | Merge branch 'JonTheNiceGuy/gitlab-ce-Ubuntu-16.04-Package'Rémy Coutable2016-09-202-0/+13
|\ \ \ \ | | | | | | | | | | | | | | | See gitlab-org/gitlab-ce!6247.
| * | | | Update .pkgr.yml with Ubuntu 16.04 dependenciesJon "The Nice Guy" Spriggs2016-09-202-0/+13
| | | | |
* | | | | Merge branch 'add_optional_author_for_commits' into 'master' Rémy Coutable2016-09-2012-68/+298
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add optional 'author' param when making commits This fulfills https://gitlab.com/gitlab-org/gitlab-ce/issues/20789 by adding the ability to specify a user's ID to be used as the author of a commit. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20789 See merge request !5822
| * | | | Add optional 'author' param when making commitsDan Dunckel2016-09-1912-68/+298
| | | | |
* | | | | Merge branch '22218-fix-note-form-footer' into 'master' Robert Speicher2016-09-206-11/+126
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix note form hint showing slash commands supported for commits ## What are the relevant issue numbers? Closes #22218 See merge request !6368
| * | | | | Add a view spec for projects/notes/_formRémy Coutable2016-09-202-16/+36
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Ensure we have a user before checking for their permission in ↵Rémy Coutable2016-09-202-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes::SlashCommandsService Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Fix note form hint showing slash commands supported for commitsRémy Coutable2016-09-205-11/+36
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'fix-regression-in-handling-build-updated' into 'master' Rémy Coutable2016-09-202-11/+14
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix processing of events when build finished. Update pipeline after processing builds. Otherwise we can get into scenario where pipeline will be marked as running. This solves a quite significant regression in Pipeline processing. Proper fix is to move all this to Sidekiq Worker and process pipeline there. I'll do it after 8.12 release. See merge request !6410
| * | | | | Fix build_updatedfix-regression-in-handling-build-updatedKamil Trzcinski2016-09-191-1/+2
| | | | | |
| * | | | | Fix processing of events when build finished.Kamil Trzcinski2016-09-192-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | This solves Pipelines in `running` after all stages do finish.
* | | | | | Merge branch 'order-stages-by-pipeline' into 'master' Rémy Coutable2016-09-202-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render stages in valid order Currently stages in stages dropdown on builds page are not in valid order. It is important to display stages in other those are defined in the pipeline. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21133 See merge request !6430
| * | | | | | Render stages in valid orderKamil Trzcinski2016-09-202-2/+3
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'feature/github-edit-path' into 'master' Rémy Coutable2016-09-2011-29/+82
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lets the user choose a namespace and name on Github imports Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14971 See merge request !5728
| * | | | | add missing spacefeature/github-edit-pathJames Lopez2016-09-201-1/+1
| | | | | |
| * | | | | fix CSSJames Lopez2016-09-201-1/+1
| | | | | |
| * | | | | fix indent in JS fileJames Lopez2016-09-201-1/+1
| | | | | |
| * | | | | updated example img in docsJames Lopez2016-09-201-0/+0
| | | | | |
| * | | | | fixes CSS issues and namespace path issue. Also tested in different browsers.James Lopez2016-09-202-6/+16
| | | | | |
| * | | | | some UI changesJames Lopez2016-09-202-15/+8
| | | | | |
| * | | | | few fixes based on MR feedbackJames Lopez2016-09-203-20/+11
| | | | | |
| * | | | | Fix namespace helper - use pluck instead of slower map version.James Lopez2016-09-201-1/+1
| | | | | |
| * | | | | modify github import JS and controller so we can now specify a namespace ↵James Lopez2016-09-2011-28/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and/or name for a project. - Fixed and added specs. - Added different namespace options depending on user privilages - Updated docs.
* | | | | | Merge branch '22364-rails-cache-redis-connection-pool' into 'master' Yorick Peterse2016-09-202-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a ConnectionPool for Rails.cache on Sidekiq servers See merge request !6429
| * | | | | | Use a ConnectionPool for Rails.cache on Sidekiq servers22364-rails-cache-redis-connection-poolPaco Guzman2016-09-202-0/+5
| | | | | | |
* | | | | | | Merge branch 'merge-request-push-compare-ui' into 'master' Jacob Schatz2016-09-206-48/+99
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frontend for Merge Request Diff This merge request improves the UX for the merge request diff feature which was recently implemented here (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127). Specifically, it styles various parts of the diff feature to match the designs, it disables comment-related buttons in states where comments are disabled, and it adds a 'Show latest version' button for convenience. ## Are there points in the code the reviewer needs to double check? I could use feedback on this MR's fidelity to the design. ## Why was this MR needed? Neccessary styling improvements for basic UX of this feature, and enabled comment buttons are not functional and thus need to be disabled in certain states. ## Screenshots (if relevant) ![57dd0755f0b14342305909](/uploads/318a44a3bc8b7fc5c9c6ef92ba92e511/57dd0755f0b14342305909.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/21427 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6127 cc: @jschatz1 See merge request !6343
| * \ \ \ \ \ \ Merge branch 'master' into merge-request-push-compare-uiBryce Johnson2016-09-2039-78/+443
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge branch 'merge-request-push-compare-ui' of ↵Bryce Johnson2016-09-2088-545/+2159
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | gitlab.com:gitlab-org/gitlab-ce into merge-request-push-compare-ui
| | * | | | | | | Fix newlines added to README.Bryce Johnson2016-09-191-4/+1
| | | | | | | | |
| | * | | | | | | Switch out comments_disabled for diff_notes_disabled.Bryce Johnson2016-09-191-3/+2
| | | | | | | | |
| | * | | | | | | style updatestauriedavis2016-09-191-6/+20
| | | | | | | | |
| | * | | | | | | Shush rubocop.Bryce Johnson2016-09-191-1/+0
| | | | | | | | |
| | * | | | | | | Add 'Show latest version' button.Bryce Johnson2016-09-191-0/+1
| | | | | | | | |
| | * | | | | | | Style merge request diff dropdowns & disable comments.Bryce Johnson2016-09-196-47/+87
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'master' into merge-request-push-compare-uiBryce Johnson2016-09-17132-1035/+1151
| |\ \ \ \ \ \ \
| * | | | | | | | Fix newlines added to README.Bryce Johnson2016-09-151-4/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into merge-request-push-compare-uiBryce Johnson2016-09-155-62/+84
| |\ \ \ \ \ \ \ \
View Lorry Controller Status