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-11-04Merge branch 'optimize/labels-finder' into 'master'Sean McGivern
Optimize group labels page Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23684 Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1148 See merge request !7123 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-20Merge branch 'feature/group-level-labels' into 'master'Douwe Maan
Add group level labels. * `LabelsFinder` * `Gitlab::Gfm::ReferenceRewriter` * `Banzai::Filter::LabelReferenceFilter` We'll be adding more feature that allow you to do cross-project management of issues. loses #19997 See merge request !6425 Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-14Merge branch 'members-ui' into 'master' Fatih Acet
Project members UI ## What does this MR do? New UI for project members that includes groups. ## Screenshots (if relevant) ### Project members ![Screen_Shot_2016-09-02_at_15.13.27](/uploads/b9d4a634d44b7b7bbb6eddb10aee86bd/Screen_Shot_2016-09-02_at_15.13.27.png) ### Group members ![Screen_Shot_2016-09-02_at_15.13.36](/uploads/c15c173e68b2c0b49bcd06ca560269d3/Screen_Shot_2016-09-02_at_15.13.36.png) ## What are the relevant issue numbers? Part of #19868 Closes #21320 See merge request !6148
2016-10-07Enable CacheMarkdownField for the remaining modelsNick Thomas
This commit alters views for the following models to use the markdown cache if present: * AbuseReport * Appearance * ApplicationSetting * BroadcastMessage * Group * Issue * Label * MergeRequest * Milestone * Project At the same time, calls to `escape_once` have been moved into the `single_line` Banzai pipeline, so they can't be missed out by accident and the work is done at save, rather than render, time.
2016-10-06Merge branch 'master' into members-uiPhil Hughes
2016-10-05Don't include archived projects when creating group milestonesJeroen Jacobs
2016-10-04Merge branch 'master' into members-uiPhil Hughes
2016-09-21Merge branch '20310-new-project-btn' into 'master' Jacob Schatz
Fix new project button alignment ## What does this MR do? Increases the width of the button/search container to fit all items at smaller screen width. The left side of the row can only have a max of two tabs (All Projects, Shared Projects), so everything can still fit on one line until they resize for mobile ## Why was this MR needed? The `New project` button wrapped to next line at smaller screen width, breaking the layout ## Screenshots (if relevant) ![Screen_Shot_2016-09-09_at_11.44.27_AM](/uploads/a726208deec6623d9fb62db0a549bf38/Screen_Shot_2016-09-09_at_11.44.27_AM.png) ![Screen_Shot_2016-09-09_at_11.46.29_AM](/uploads/bd8dc911757b14c5fafc4d3849e0b242/Screen_Shot_2016-09-09_at_11.46.29_AM.png) ## What are the relevant issue numbers? Closes #20310 See merge request !6286
2016-09-15Syntax fixes and better tests for helper methods. Updated docs.Patricio Cano
2016-09-15Added group-specific setting for LFS.Patricio Cano
Groups can enable/disable LFS, but this setting can be overridden at the project level. Admin only
2016-09-14Fix new project button alignmentAnnabel Dunstone Gray
2016-09-13CSS cleanupPhil Hughes
2016-09-13Updated groups member UI to matchPhil Hughes
2016-09-13Mobile improvementsPhil Hughes
Added group name to members row Fixed saving group member
2016-09-02Fix expiration date picker after updateSean McGivern
2016-08-24change from members using size to start using total_count in the grouptiagonbotelho
members page
2016-08-19Add descriptionsDouwe Maan
2016-08-18Add expiration date to group membershipsSean McGivern
2016-07-22Add light border to rounded avatarsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-20Allow to disable user request access to groups/projectsFelipe Artur
2016-07-14Update permissons links to new pageSean McGivern
permissions/permissions just links to user/permissions since https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5210
2016-07-12Remove the group avatar link.Connor Shea
For group pages, e.g. https://gitlab.com/groups/gitlab-org, I see no reason to link to the avatar image itself when clicking on the avatar. If the user really wants to open the image, they can do so by right clicking and opening the image in a new tab.
2016-07-12Merge branch 'dz-small-ui-improvements' into 'master' Dmitriy Zaporozhets
Remove icons from some buttons which already has text Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 * remove plus icon from new milestone button on group milestone page * remove plus icon from new project button on group projects page * remove plus icon from milestone page See merge request !5050
2016-07-11Update the help_page_path route to accept paths directly instead of using ↵Connor Shea
parameters.
2016-07-01Remove icons from some buttons which already has textDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-07-01Exclude requesters from Project#members, Group#members and User#membersRémy Coutable
And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-07-01Improve the request / withdraw access buttonRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-30Remove unnecessary parensValery Sizov
2016-06-29merge master into issue_3359_3Felipe Artur
2016-06-22merge master into issue_3359_3Felipe Artur
2016-06-22Insert notification settings dropdown into groupsFelipe Artur
2016-06-22Insert notification settings dropdown into groupsFelipe Artur
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
2016-06-20Display group/project access requesters separately in adminRémy Coutable
Also, reuse partials from the non-admin views. Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-17using request dot path insteadbarthc
2016-06-15Fix wrong partial path in JS viewRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
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-10Don't try to count a relation with aliasesSean McGivern
98f147e84d2bd8f2278452ac0852118452c76d4a fixed this for issues in HTML, but not MRs or Atom feeds.
2016-06-10Merge branch 'dz-improve-ui-consistency-2' into 'master' Jacob Schatz
Improve ui consistency. Part 2 * Use responsive top-area on project branches and tags pages * Use default button size in the content list controls * Improve button margin for btn-grouped css class For https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 See merge request !4536
2016-06-09Improved the UX of issue & milestone date pickerPhil Hughes
Closes #18198
2016-06-09Merge branch '18333-layout-bug' into 'master' Jacob Schatz
Use container helper instead of hard coded container ## What does this MR do? Add `container_class` helper class to fix layout bug ## What are the relevant issue numbers? #18333 ## Screenshots (if relevant) Fixed: ![Screen_Shot_2016-06-08_at_2.03.38_PM](/uploads/6e7575d711efb8eaf6ba641907b2d607/Screen_Shot_2016-06-08_at_2.03.38_PM.png) Fluid: ![Screen_Shot_2016-06-08_at_2.03.56_PM](/uploads/33d3f73781ca9ed129f853abfe9feb4b/Screen_Shot_2016-06-08_at_2.03.56_PM.png) See merge request !4543
2016-06-08Use container helper instead of hard coded containerAnnabel Dunstone
2016-06-08Improve button margin for btn-grouped css classDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-08Remove unnecessary icons from buttonsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-25Merge branch 'rs-remove-issue_to_atom' into 'master' Douwe Maan
Remove `issue_to_atom` helper See merge request !4265
2016-05-24Remove `issue_to_atom` helperRobert Speicher
2016-05-23Remove `event_to_atom` helperRobert Speicher
2016-05-18Link to group feed from group activity pageSean McGivern
2016-05-18Point group's issues atom feed to groupSean McGivern
This was using the user dashboard atom builder template, not one for the group's issues.