Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-06-22Merge branch ↵Douwe Maan
'18871-check-improve-how-we-display-access-requesters-in-admin-area' into 'master' Display group/project access requesters separately in admin ## What does this MR do? It displays the access requesters in a separate list in group & project members pages. It also harmonize the members counter UI to use `%span.badge` everywhere (in the admin & non-admin members views). ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? To not confuse access requesters with actual members. ## What are the relevant issue numbers? Closes #18871. ## Screenshots ### Group members | Before | After | | --------- | ---- | | ![group-members-before](/uploads/2f15137e073fd3a63bc2cb7b2217cb6c/group-members-before.png) | ![group-members-after](/uploads/5b643974505cfa57783fa0320d3bf8b2/group-members-after.png) | ### Project members | Before | After | | --------- | ---- | | ![project-members-before](/uploads/9c48dcd3736e42de84061b1201ee0b06/project-members-before.png) | ![project-members-after](/uploads/8e04c92ef0bba3de7e2405618632b27d/project-members-after.png) | ### Admin group members | Before | After | | --------- | ---- | | ![admin-group-members-before](/uploads/7fda8c2c94b697bea6655ba892ba45e7/admin-group-members-before.png) | ![admin-group-members-after](/uploads/ea25717001794f75939c679b80308c3a/admin-group-members-after.png) | ### Admin project members | Before | After | | --------- | ---- | | ![admin-project-members-before](/uploads/ba9d3ec52adbda6bb3d45ad9ac5243d3/admin-project-members-before.png) | ![admin-project-members-after](/uploads/3b889a029a9756e9ed2781b45c4dd9cb/admin-project-members-after.png) | ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since this is related to the original "request access" MR. - [ ] All builds are passing - [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) See merge request !4798 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22Merge branch ↵Douwe Maan
'18755-fix-destroy-project-causes-post_decline_request-to-be-executed' into 'master' Resolve "Destroying a project causes post_decline_request to be executed" ## What does this MR do? Ensure we don't send "access request declined" to access requesters when a project is deleted. ## Are there points in the code the reviewer needs to double check? I've created a service to decouple the notification sending from the AR model. ## Why was this MR needed? Because there was an issue. ## What are the relevant issue numbers? Fixes #18755, #18750. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG needed. - [x] Tests - [x] Added for this feature/bug - [x] All builds are passing - [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) See merge request !4744 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-22Merge branch 'rename-code-to-repo' into 'master' Dmitriy Zaporozhets
Rename Code tab to Repository As discussed in #18830, this renames the "Code" tab to "Repository". Screenshot now: ![image](/uploads/a7807dfb5b42f037fe2a44475a4af883/image.png) See merge request !4807
2016-06-21Merge branch 'notification-dropdown-active-fix' into 'master' Jacob Schatz
Fixed issue with notification dropdown not updating active ## What does this MR do? This fixes an issue where the notification dropdown wouldn't correctly update the selected notification type in the dropdown. I've also added a spinner to show the action is happening & removed the flash message for success. ## What are the relevant issue numbers? Closes #18480 ## Screenshots (if relevant) ![notifications](/uploads/5ed5055d180c12450cea77543ae5f44e/notifications.gif) See merge request !4615
2016-06-21Merge branch 'async-refs-dropdown' into 'master' Jacob Schatz
Refs dropdown is now loaded async ## What does this MR do? The refs dropdown is loaded async so not to block the page. ## What are the relevant issue numbers? Part of #18202 ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_14.41.21](/uploads/8fea12655f96fe7f7008a32677bff037/Screen_Shot_2016-06-07_at_14.41.21.png) See merge request !4508
2016-06-20Merge branch 'new-project-mobile' into 'master' Jacob Schatz
New Project page improvements for mobile ## What does this MR do? Redesigns the "Project path" fields on the New Project page. ## Are there points in the code the reviewer needs to double check? Not that I know of, nothing I changed should break any other pages. ## Why was this MR needed? The new project page was unusable on mobile because the project name text field didn't have enough space. ## What are the relevant issue numbers? Fixes #18599. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-06-15_at_12.38.58_PM](/uploads/046a824b283e24266cabc9ea3dfb169c/Screen_Shot_2016-06-15_at_12.38.58_PM.png) After: ![Screen_Shot_2016-06-15_at_12.37.19_PM](/uploads/6d01310192965b413bfedd9c8d2129f7/Screen_Shot_2016-06-15_at_12.37.19_PM.png) ![Screen_Shot_2016-06-15_at_12.37.28_PM](/uploads/3944a0f0ab04373ec92f7cafe90872df/Screen_Shot_2016-06-15_at_12.37.28_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc: @jschatz1 @dzaporozhets See merge request !4687
2016-06-18Merge branch 'issue_12758' into 'master' Douwe Maan
Implement custom notification level options ![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png) ![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png) part of #12758 See merge request !4389
2016-06-17Merge branch 'fix-todos-counters' into 'master' Robert Speicher
Ensure Todos counters doesn't count Todos for projects pending delete Use `TodosFinder` instead of `current_user.todos` to filter projects pending delete on Todos counters helpers. Counters should not reflect the number of Todos displayed on the tabs. Fixes #18633 See merge request !4663
2016-06-17Merge branch 'feature/project-export' into 'master' Douwe Maan
Export project functionality This is a MR for the export functionality of https://gitlab.com/gitlab-org/gitlab-ce/issues/3050, which adds the ability to export single projects. - [x] members - DB data - [x] issues - [x] issue comments - [x] merge requests - [x] merge request diff - [x] merge request comments - [x] labels - [x] milestones - [x] snippets - [x] releases - [x] events - [x] commit statuses - [x] CI builds - File system data - [x] Git repository - [x] wiki - [x] uploads - [ ] ~~CI build traces~~ - [ ] ~~CI build artifacts~~ - [ ] ~~LFS objects~~ - DB configuration - [x] services - [x] web hooks - [x] protected branches - [x] deploy keys - [x] CI variables - [x] CI triggers See merge request !3114
2016-06-16Merge branch 'commits-ui' into 'master' Jacob Schatz
Updated commits UI Closes #14633 See merge request !4271
2016-06-15Fix admin active tab testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-14UI and copywriting improvementsRémy Coutable
+ Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-14Add request access for groupsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10Fix profile testAnnabel Dunstone
2016-06-10Render only issues/mr in subnav depends on contextDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-10CI build page UI updatePhil Hughes
Added sidebar Removed elements not present in design
2016-06-09Fixed failing label subscribe testPhil Hughes
2016-06-09Tests updatePhil Hughes
2016-06-09Fixed failing testsPhil Hughes
2016-06-09Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable
Fix wiki linking behavior for markdown wiki pages Related to #18019 - As per the documentation in !4372 ## TODO - [ ] !4432 Have wiki linking behave as per the documentation - [x] Move `WikiLinkFilter` specs to the pipeline level - [x] Verify current behavior on wiki `show` page - [x] Fix current behavior on wiki `show` page - [x] Verify current behaviour on wiki preview - [x] Fix current behaviour on wiki preview - [x] Rewrite all links and get preview links working - [x] Make sure all links are on-par with the wiki `show` page - [x] TDD `WikiLinkFilter` and get it working - [x] Hook `WikiLinkFilter` up - [x] Fix tests - [x] Fix `markdown_spec` - [x] Fix `wiki` spinach feature - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/4f50dd2/builds) to pass - [x] Make sure all wiki-related pages are working as expected (history, all pages, etc.) - [x] Test in different ruby versions - [x] GitLab instances hosted on a relative URL - [x] Non-markdown rendering formats? - [x] RDoc - [x] ASCIIDoc - [x] Create issues to fix things for RDoc and ASCIIDoc - [x] Gauge performance impact - [x] Refactor - [x] Re-organize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f860e9a8dcabe7d5f160c32fc549807c98baa4a1/builds) passes - [x] Respond to @rymai's comments - [x] `class WikiLinkFilter < HTML::Pipeline::Filter` - [x] blank line after guard clause - [x] keyword arguments for `wiki` and `slug` - [x] invert the condition - [x] inline `user` in spec - [x] Make sure spec names are not out of date - [x] Comment for each rewrite rule - [x] Add CHANGELOG entry - [x] Reorganize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/19b91e749a6320d12fb299d33f1f6440777e0e26/builds) passes - [ ] Wait for merge See merge request !4432
2016-06-09Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew
- Need to pass in a `page_slug` to the filter, so it can rewrite based on the current page (all links are rewritten to the level of the app root). - The earlier `markdown_preview` endpoint was at the level of the wiki. We need to know the current page (for rewriting, as above), so this commit moves the endpoint to the level of a wiki page. - Fix all tests
2016-06-08Enable Knapsack only in CI environmentKamil Trzcinski
2016-06-07Merge branch 'notification-dropdown-labels' into 'master' Jacob Schatz
Notifications dropdown on project page now has descriptions ## What does this MR do? Adds descriptions to the notification settings dropdown on project pages. Also changed the order of them to make more sense. ## What are the relevant issue numbers? Part of #12758 ## Screenshots (if relevant) ![Screen_Shot_2016-05-31_at_09.35.24](/uploads/b30d82701a13ec15f672139e1225acf5/Screen_Shot_2016-05-31_at_09.35.24.png) See merge request !4374
2016-06-07Merge branch '18013-compact-sidebar' into 'master' Jacob Schatz
Implement compact side nav ## What does this MR do? Implements new compact nav design Note- new navbar icons are in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4268) ## What are the relevant issue numbers? Closes #18013 ## Screenshots (if relevant) ![Screen_Shot_2016-06-02_at_3.20.37_PM](/uploads/d31bd17ae47743f1a20d7429b4396e84/Screen_Shot_2016-06-02_at_3.20.37_PM.png) ![Screen_Shot_2016-06-02_at_3.20.43_PM](/uploads/d03a080a57707b6a2161127f3904fcd5/Screen_Shot_2016-06-02_at_3.20.43_PM.png) cc @dzaporozhets See merge request !4447
2016-06-07Merge branch 'issue_14189' into 'master' Jacob Schatz
Ability to prioritize labels Closes #14189 See merge request !4009
2016-06-07Remove todos count tests in navAnnabel Dunstone
2016-06-07Fixed failing testsPhil Hughes
2016-06-07Merge branch 'knapsack' into 'master' Douwe Maan
Use Knapsack to evenly distribute specs Try to distribute all tests evenly accross all nodes to reduce the testing time of GitLab CE. This uses high amount of auto-scaled machines. See merge request !4240
2016-06-07Merge branch 'zj-workhorse-to-serve-diffs' into 'master' Jacob Vosmaer (GitLab)
Workhorse to serve raw diffs Fixes (partially) #13999 Dependent on: gitlab-org/gitlab-workhorse!45 See merge request !4130
2016-06-07Merge remote-tracking branch 'origin/master' into knapsackKamil Trzcinski
# Conflicts: # .gitlab-ci.yml
2016-06-07Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski
2016-06-06Fix failing testsAlfredo Sumaran
2016-06-06Remove prev/next buttons on issues and merge requestsAlejandro Rodríguez
The buttons were rarely used and added at least 1 query each on every page load.
2016-06-06Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski
# Conflicts: # features/steps/shared/builds.rb # spec/requests/ci/api/builds_spec.rb
2016-06-06Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski
2016-06-06Fix tests offenses: use `pipeline` of Ci::Build and rename viewsKamil Trzcinski
2016-06-04Ensure we are clicking a visible dropdownAlfredo Sumaran
2016-06-03Workhorse to serve raw diffsZeger-Jan van de Weg
2016-06-03Use knapsack everywhereKamil Trzcinski
2016-06-03Use own version of knapsack which supports spinach testsKamil Trzcinski
2016-06-03WIPKamil Trzcinski
2016-06-03Try to use knapsackKamil Trzcinski
2016-06-03Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski
2016-06-03Merge branch 'master' into awardablesZ.J. van de Weg
2016-06-03Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski
2016-06-03Rename Ci::Build commit to pipelineKamil Trzcinski
2016-06-03Fix more tests with new Code tabDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-03Update tests to match new Code tab logicDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-02Refactor. Add tests.Josh Frye
2016-06-02Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski