Commit Graph
716 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets 268868bcf0 Improve milestone page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-03 13:21:09 +02:00
Dmitriy Zaporozhets f3f820d0bd Move modal css to separate file and fix danger text for confirmation modal
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-29 19:02:30 +02:00
Zeger-Jan van de Weg ad99404d25 Properly handle bigger files 2016-04-28 21:28:39 +02:00
Kamil Trzcinski cb90368a69 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-04-26 16:36:17 +02:00
Jacob Schatz d809507e05 Merge branch 'issue_14904' into 'master'
Add new shortcuts

Closes #14904

- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.

See merge request !3686
2016-04-25 19:13:25 +00:00
Rémy Coutable d5398e9656 Merge branch 'issue_3799' into 'master'
Allow filtering by Owned projects on dashboard page

Closes #3799 

![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png)

See merge request !3762
2016-04-22 08:40:01 +00:00
Yorick Peterse d35dde0129 Merge branch 'remove-update-files' into 'master'
Removed JS update templates

See merge request !3814
2016-04-21 22:23:41 +00:00
Alfredo Sumaran c9fe9f59d2 Merge remote-tracking branch 'origin/master' into issue_3799 2016-04-21 16:03:33 -05:00
Alfredo Sumaran 41cee8c38e Do not display filters if user if there's no current_user 2016-04-21 16:03:14 -05:00
Alfredo Sumaran 3b39214f29 Merge remote-tracking branch 'origin/master' into issue_14904 2016-04-21 12:47:32 -05:00
Jacob Schatz 6a27a80867 Merge branch 'label-dropdown-fix' into 'master'
Fixes "create label" functionality on label dropdown

**Issue sidebar**

![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif)

**Issues page**

![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif)



See merge request !3670
2016-04-21 17:32:24 +00:00
Kamil Trzciński d240666800 Merge branch 'ci-commit-as-pipeline' into 'master'
Ci::Commit becomes a Pipeline object

1. Ci::Commit receives context: ref, :tag.
1. One Ci::Commit describes a one Pipeline
1. Pipeline is created from `.gitlab-ci.yml`
1. Pipeline is a ordered group of builds
1. We test MR against Pipeline
1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703)
1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future)
1. We add a Pipeline Hook that will be triggered on Pipeline status change  (future)
1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future)

After merging that I'll prepare a separate MR that will unify naming, database columns, table names:
```
Ci::Commit -> Pipeline
Ci::Build -> Build
CommitStatus -> Job
GenericCommitStatus -> ExternalJob

ci_commits -> pipelines
ci_builds -> jobs
```

This MR implements first 5 points.

This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149.

See merge request !3653
2016-04-21 08:10:37 +00:00
Alfredo Sumaran 5c10b29700 Merge remote-tracking branch 'origin/master' into issue_14904
# Conflicts:
#	app/views/shared/issuable/_sidebar.html.haml
2016-04-20 17:26:47 -05:00
Alfredo Sumaran 7e0ef892f4 Merge remote-tracking branch 'origin/master' into label-dropdown-fix 2016-04-20 17:10:10 -05:00
Alfredo Sumaran c9f11db219 Make shortcuts work when sidebar is collapsed 2016-04-20 17:04:40 -05:00
Rémy CoutableandRobert Speicher e54a2ba6aa Remove duplicate hidden_field and fix Rubocop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-20 15:43:32 -04:00
Rémy CoutableandRobert Speicher 6cdf4acd4e Address MR feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-20 15:43:32 -04:00