summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add nested groups support on data leveldz-nested-groupsDmitriy Zaporozhets2016-12-0826-159/+402
| | | | | | | | * add parent_id field to namespaces table to store relation with nested groups * create routes table to keep information about full path of every group and project * project/group lookup by full path from routes table Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'dz-fix-group-label-404' into 'master' Rémy Coutable2016-12-072-11/+32
|\ | | | | | | | | | | | | Fix 404 error when visit group label edit page Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25158 See merge request !7957
| * Fix 404 error when visit group label edit pagedz-fix-group-label-404Dmitriy Zaporozhets2016-12-062-11/+32
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'remove-has-visible-content-caching' into 'master' Douwe Maan2016-12-073-42/+7
|\ \ | | | | | | | | | | | | | | | | | | Remove caching of Repository#has_visible_content? This MR removes the caching of `Repository#has_visible_content?`. The cache for this method is no longer necessary and this should solve the problem described in https://gitlab.com/gitlab-org/gitlab-ce/issues/25278. See merge request !7947
| * | Remove caching of Repository#has_visible_content?remove-has-visible-content-cachingYorick Peterse2016-12-063-42/+7
| | | | | | | | | | | | | | | | | | | | | This method already uses the cached method Repository#branch_count so there's no point in also caching has_visible_content?. Fixes gitlab-org/gitlab-ce#25278
* | | Merge branch 'cleanup-7180' into 'master' Robert Schilling2016-12-061-9/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A simpler implementation of finding a merge request ## What does this MR do? This cleans up some code in the issues API as discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7180#note_19501743 The helper method `merge_request_for_resolving_discussions` was no longer needed as it was only used once. That made it possible to simplify the implementation. ## Does this MR meet the acceptance criteria? - [x] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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? !7180 See merge request !7955
| * | | A simpler implementation of finding a merge requestBob Van Landuyt2016-12-061-9/+6
| | |/ | |/| | | | | | | Following a discussion in !7180
* | | Merge branch 'remove-pages-css' into 'master' Jacob Schatz2016-12-065-35/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove more pages css * Moves award emojis to `/framework` * Moves generic image styles to `/framework` * Removes `confirmation.scss` See merge request !7952
| * \ \ Merge branch 'master' into 'remove-pages-css'remove-pages-cssAnnabel Dunstone Gray2016-12-0619-250/+192
| |\ \ \ | | | | | | | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework.scss
| * | | | Remove confirmation.scssAnnabel Dunstone Gray2016-12-062-35/+4
| | | | |
| * | | | Move award emojis to framworkAnnabel Dunstone Gray2016-12-062-0/+2
| | | | |
| * | | | Move image styles to frameworkAnnabel Dunstone Gray2016-12-061-0/+0
| | | | |
* | | | | Merge branch 'remove-dashboard-css' into 'master' Jacob Schatz2016-12-062-49/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Remove dashboard.scss See merge request !7960
| * | | | Remove dashboard.scssAnnabel Dunstone Gray2016-12-062-49/+0
| | | | |
* | | | | Merge branch 'remove-tags-scss' into 'master' Jacob Schatz2016-12-064-57/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tags.scss Remove `tags.scss` See merge request !7935
| * | | | | Remove tags.scssremove-tags-scssAnnabel Dunstone Gray2016-12-064-57/+60
| | |/ / / | |/| | |
* | | | | Merge branch 'admin-scss' into 'master' Jacob Schatz2016-12-0613-193/+127
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Remove admin.scss Removes admin-specific CSS See merge request !7932
| * | | | Remove admin.scssadmin-scssAnnabel Dunstone Gray2016-12-0511-139/+99
| | | | |
| * | | | Truncate fix, remove unneeded admin-specific cssAnnabel Dunstone Gray2016-12-055-54/+28
| | | | |
* | | | | Merge branch 'patch-7' into 'master' Sean McGivern2016-12-061-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Encourage bug reporters to mention if they use GitLab.com [ci skip] See merge request !7954
| * | | | Encourage bug reporters to mention if they use GitLab.com [ci skip]Adam Niedzielski2016-12-061-0/+2
|/ / / /
* | | | Merge branch 'deleted-source-branch-comment' into 'master' Sean McGivern2016-12-061-0/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Explain "js: true" in "deleted_source_branch_spec.rb" See merge request !7949
| * | | Explain "js: true" in "deleted_source_branch_spec.rb" [ci skip]Adam Niedzielski2016-12-061-0/+3
| | | |
* | | | Merge branch '23589-open-issue-for-mr' into 'master' Sean McGivern2016-12-0628-22/+670
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Create an issue for all unresolved discussions in an MR See merge request !7180
| * | | | Feature: delegate all open discussions to IssueBob Van Landuyt2016-12-0528-22/+670
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a merge request can only be merged when all discussions are resolved. This feature allows to easily delegate those discussions to a new issue, while marking them as resolved in the merge request. The user is presented with a new issue, prepared with mentions of all unresolved discussions, including the first unresolved note of the discussion, time and link to the note. When the issue is created, the discussions in the merge request will get a system note directing the user to the newly created issue.
* | | | | Merge branch '24733-archived-project-merge-request-count' into 'master' Sean McGivern2016-12-068-9/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Archived project merge requests add to group's Merge Requests Closes #24733 See merge request !7790
| * | | | | Fix Archived project merge requests add to group's Merge RequestsJacopo2016-12-058-9/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | counter This is done by: - Extending the IssuableFinder adding the non_archived option to the params - Overriding the #filter_params in the MergeRequestsAction - Passing the non_archived param in the nav/_group.html.haml navbar partial from the groups/merge_requests.html.haml
* | | | | | Merge branch 'zj-guest-reads-public-builds' into 'master' Sean McGivern2016-12-0611-12/+95
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | Guests can read builds if those are public See merge request !6842
| * | | | | Update effected testszj-guest-reads-public-buildsZ.J. van de Weg2016-12-047-47/+45
| | | | | |
| * | | | | Guests can read builds if those are publicZ.J. van de Weg2016-12-047-10/+95
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #18448
* | | | | | Merge branch 'refine-ci-statuses' into 'master' Kamil Trzciński2016-12-0629-7/+698
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refine CI Statuses ## What does this MR do? This MR introduces classes for each relevant CI status. ## What are the relevant issue numbers? Closes #24273 See merge request !7889
| * | | | | | Add text example for pipeline status without actionrefine-ci-statusesGrzegorz Bizon2016-12-061-1/+3
| | | | | | |
| * | | | | | Use detailed status as CSS class in pipelines listGrzegorz Bizon2016-12-061-1/+1
| | | | | | |
| * | | | | | Use status text when redering pipelines listGrzegorz Bizon2016-12-061-1/+1
| | | | | | |
| * | | | | | Improve support for icons in new detailed statusesGrzegorz Bizon2016-12-063-2/+5
| | | | | | |
| * | | | | | Add status label information to pipeline headerGrzegorz Bizon2016-12-061-0/+1
| | | | | | |
| * | | | | | Untangle status label and text in ci status helperGrzegorz Bizon2016-12-062-2/+21
| | | | | | |
| * | | | | | Simplify ci status helper with detailed statusGrzegorz Bizon2016-12-061-22/+22
| | | | | | |
| * | | | | | Remove unsued variable from merge request widgetGrzegorz Bizon2016-12-061-2/+1
| | | | | | |
| * | | | | | Restore legacy statuses support in ci status helpersGrzegorz Bizon2016-12-061-0/+4
| | | | | | |
| * | | | | | Add support for detailed status to status helpersGrzegorz Bizon2016-12-053-24/+36
| | | | | | |
| * | | | | | Expose pipeline detailed status using status factoryGrzegorz Bizon2016-12-052-0/+74
| | | | | | |
| * | | | | | Extend tests for pipeline status factoryGrzegorz Bizon2016-12-051-3/+16
| | | | | | |
| * | | | | | Implement pipeline status factory with extended statusGrzegorz Bizon2016-12-052-0/+76
| | | | | | |
| * | | | | | Fold core/extended status modules to reduce nestingGrzegorz Bizon2016-12-0523-60/+54
| | | | | | |
| * | | | | | Implement extended pipeline - status with warningsGrzegorz Bizon2016-12-022-0/+77
| | | | | | |
| * | | | | | Add implementation of common pipeline extended statusGrzegorz Bizon2016-12-023-4/+28
| | | | | | |
| * | | | | | Add information about badge test to core statusesGrzegorz Bizon2016-12-0215-0/+60
| | | | | | |
| * | | | | | Add scaffold for remaining statuses-related classesGrzegorz Bizon2016-12-028-0/+64
| | | | | | |
| * | | | | | Implement the rest of core CI statuses with specsGrzegorz Bizon2016-12-0215-8/+160
| | | | | | |
View Lorry Controller Status