Commit Graph
733 Commits
Author SHA1 Message Date
Jacob Schatz 5b83abcc01 Merge branch 'issue_14189' into 'master'
Ability to prioritize labels

Closes #14189 

See merge request !4009
2016-06-07 15:15:07 +00:00
Sean McGivernandAlfredo Sumaran 77f30af017 Tidy up Ruby style in templates 2016-06-06 11:59:49 -05:00
Alfredo Sumaran b4e4e61184 Show functionality only for users with the ability to edit labels 2016-06-06 11:59:49 -05:00
Alfredo Sumaran bf0c4426ff Feedback 2016-06-06 11:59:49 -05:00
Sean McGivernandAlfredo Sumaran 1cc0209a80 Fix style
- `reorder(nil)` is better than `reorder('')`
- Only use ASCII in comments
2016-06-06 11:59:49 -05:00
Sean McGivernandAlfredo Sumaran b28237b4d2 Don't try to count a relation with aliases
Work around ActiveRecord count and column aliases issue as described at:
  <https://github.com/rails/rails/issues/15138#issuecomment-61325080>

AR doesn't promise that `#count` (which is called by `#any?`) will work
for relations using `#select`, which means we need a workaround instead.
2016-06-06 11:59:49 -05:00
Alfredo Sumaran 25ee66e88c Sorting improvements and styling 2016-06-06 11:59:49 -05:00
Thijs WoutersandAlfredo Sumaran d8263b2851 Sort by label priority
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-06 11:59:49 -05:00
Alejandro Rodríguez 535d11302e Remove prev/next buttons on issues and merge requests
The buttons were rarely used and added at least 1 query each on every page load.
2016-06-06 12:01:50 -04:00
Alfredo Sumaran 7df4a3c53a Fix spec 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 22b8b9a7f3 Address feedback 2016-06-03 17:14:23 -05:00
Alfredo Sumaran f1291b1b9f Bulk assignment implementation 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 90c2ab02b5 Add show_create param to toggle label creation option 2016-06-03 17:14:23 -05:00
Alfredo Sumaran d09114e4ed Add show_footer parameter for ability to hide footer 2016-06-03 17:14:23 -05:00
Alfredo Sumaran 243e513255 Add .js-filter-submit when needed 2016-06-03 17:10:20 -05:00
Alfredo Sumaran dbccacdb82 Ability to assign a label to multiple issues 2016-06-03 17:10:20 -05:00
Paco Guzman 078ba8c090 issuable#labels_array explicitly load the labels
This will be useful when you want to ask for the 
number of items and later iterate over them, without 
needing to ask if the association is load or not.

So you avoid extra database queries
2016-06-02 21:43:01 +02:00
Douwe Maan 2d084dd848 Merge branch 'separate-banzai-references' into 'master'
Separate reference gathering from rendering

This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query.

cc @rspeicher @DouweM 

See merge request !3969
2016-06-01 15:51:59 +00:00
Lin Jen-Shin 538b2d687e Use Snippet#to_reference directly 2016-05-31 13:03:30 +00:00
Lin Jen-Shin 908ea1b00a Use $ as the snippet prefix so it's consistent 2016-05-28 22:03:30 +08:00
Jacob Schatz 29db3f2c52 Merge branch 'filter-by-any-user' into 'master'
Filter issuables by any user

![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif)

Closes #2836

See merge request !3820
2016-05-26 22:00:22 +00:00
Jacob Schatz 1a848d8354 Merge branch 'move-project-dropdown-async' into 'master'
Loads move issue dropdown async

To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns.

![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif)

Closes #16563

See merge request !4160
2016-05-26 18:28:01 +00:00
Yorick Peterse 25c08d11bb Added author to various Markdown calls in views
This ensures all these calls have an author set, allowing the use of
"all" mentions where possible.
2016-05-26 17:14:06 +02:00
Josh Frye 85495c8c85 Merge branch 'remove-main-language' into 'master'
Remove main_language and tests. Closes #14937



See merge request !4293
2016-05-26 14:49:25 +00:00
Phil Hughes bc0666b3c9 Filter issuables by any user
Closes #2836
2016-05-26 10:04:17 +01:00
Annabel Dunstone 79f890ca85 Add fade out to sub nav 2016-05-25 17:14:28 -05:00
Josh Frye 6d2a0a6b9b Remove main_language and tests 2016-05-25 17:16:42 -04:00
Jacob Schatz 0cc060bc5f Merge branch 'issue-filter-name-options' into 'master'
Issuable filtering improvements

This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both. Fixes #4252 

Fixed issue with not being able to filter and sort issues without refreshing the page. Fixes #15269 

See merge request !3699
2016-05-25 19:44:06 +00:00
Jacob Schatz d6e5299fb6 Merge branch 'snippets-ui' into 'master'
Updated snippets UI

![Screen_Shot_2016-05-18_at_14.11.54](/uploads/2544351e50f19a36c4ba9a7a92d5544b/Screen_Shot_2016-05-18_at_14.11.54.png)

Closes #14328

See merge request !4194
2016-05-24 21:15:19 +00:00
Dmitriy Zaporozhets 2f4dc1ee16 Merge branch 'master' into project-navigation-redesign 2016-05-23 22:41:11 +02:00
Phil Hughes a69ab104de Added remove due date button
In the sidebar when there is a due date, a link to remove due date becomes visible

Closes #17392
2016-05-23 08:40:04 +01:00
Tony Chu ad13d357e7 fix user.name length in milestones participants tab 2016-05-21 13:52:38 +08:00
Jacob Schatz 73403c4ca7 Merge branch 'issuable-new-due-date' into 'master'
Issuable form due date

For some reason, this was never in the original merge request for due date?

![Screen_Shot_2016-04-22_at_21.49.44](/uploads/7d4e2b07f75a33009e3170fdb076a4bd/Screen_Shot_2016-04-22_at_21.49.44.png)

Closes #15516

See merge request !3895
2016-05-21 03:34:43 +00:00
Jacob Schatz 535252005e Merge branch 'fix/style-empty-groups' into 'master'
Wrap "No groups found" message with a .nothing-here-block

The "No groups found" message's style is inconsistent with the other empty messages.

## Screenshots

### Empty groups
![Screen_Shot_2016-05-13_at_13.40.34](/uploads/1447c5f60cde7d50d6f8f07c41704e5c/Screen_Shot_2016-05-13_at_13.40.34.png)

### Empty projects
![Screen_Shot_2016-05-13_at_13.40.30](/uploads/c21ff093f3d6bdbafecf7b075fa33d3c/Screen_Shot_2016-05-13_at_13.40.30.png)

See merge request !4137
2016-05-21 00:07:08 +00:00
Phil Hughes 672bd4e6ff Correctly sends project ID 2016-05-20 21:52:45 +01:00
Jeroen Jacobs 7880a300dc Allows MR authors to have the source branch removed when merging the MR 2016-05-20 11:30:03 +02:00
Phil Hughes f307ff3413 Replaced line breaks 2016-05-20 09:11:28 +01:00
Annabel Dunstone 5bb7fa1bd9 Redesign project page header 2016-05-19 13:16:57 -05:00
Karlo Soriano 0d9c351b47 Wrap "No groups found" message with a .nothing-here-block 2016-05-19 09:23:20 +08:00
Phil Hughes da5f0b9119 Updated snippets UI
Closes #14328
2016-05-18 14:11:06 +01:00
Phil Hughes 5c4416bb45 Loads move issue dropdown async
Closes #16563
2016-05-16 15:24:51 +01:00
Phil Hughes d4777cd86b Updated if statement 2016-05-16 10:35:14 +01:00
Phil Hughes 5f66bfe7ed Added due date calendar to new issue form
Closes #15516
2016-05-16 10:35:14 +01:00
Phil Hughes 7df4b16b56 Fixed issue with not being able to search text & filter 2016-05-16 10:30:59 +01:00
Phil Hughes 1a086745fc Fixed tests 2016-05-16 10:29:47 +01:00
Phil Hughes fdc949073c Fixed issue with not being able to sort and filter 2016-05-16 10:29:47 +01:00
Phil Hughes 832d7fa3ce Issuable filtering improvements
This improves the filtering of issues and merge requests by creating a single file that encapsulates all the filtering. Previously this was done with a file for issues and a file for merge requests.

Created the ability for the text search to be done alongside other filterables. Previously because this was outside the filterable form, this wasn't possible and would instead do either filter dropdown or text filter - not both.
2016-05-16 10:29:47 +01:00
Kamil Trzcinski 7c1acb022a Merge remote-tracking branch 'origin/master' into with-pipeline-view
# Conflicts:
#	app/views/projects/ci/builds/_build.html.haml
#	app/views/projects/commit/_ci_commit.html.haml
#	app/views/projects/commit/_commit_box.html.haml
2016-05-09 23:53:02 +03:00
Annabel Dunstone 8d19955c05 Revert counter parentheses back to badges 2016-05-04 17:07:47 -05:00
Annabel Dunstone 7878eb9fa6 Start builds redesign 2016-05-04 16:45:37 -05:00