Commit Graph

1683 Commits

Author SHA1 Message Date
Guilherme Salazar 32913b74b8 add "x of y tasks completed" on issuable
fix issues pointed out in !6527

add task completion status feature to CHANGELOG
2016-10-28 14:01:36 -02:00
Phil Hughes a2eff1a8e5 Merge branch 'master' into issue-board-sidebar 2016-10-26 08:47:09 +01:00
Dmitriy Zaporozhets 7ded7c17d4 Update project member controller to match recent master logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-24 13:14:00 +03:00
Dmitriy Zaporozhets f5659ac4d1 Add parentheses around return redirect_to method
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-24 13:14:00 +03:00
Dmitriy Zaporozhets c82278898d Refactor groups/projects members controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-24 13:14:00 +03:00
Linus G Thiel 036fac06d1 Gracefully handle adding of no users to projects and groups
- Disable {project, group} members submit button if no users

  If no users are selected, the submit button should be disabled.

- Alert user when no users were added to {project, group}.

  When no users were selected for adding, an alert message is
  flashed that no users were added.

- Also, this commit adds a feedback when users were actually added to a
  project, in symmetry with how group members are handled.

Closes #22967, #23270.
2016-10-24 13:14:00 +03:00
Douwe Maan 030c82267f Merge branch '23341-fix-viewing-mr-from-deleted-project' into 'master'
Fix a 500 error viewing an MR with a deleted source project

## What does this MR do?

Allows merged MRs to be shown without any 500 errors if the source project is removed

## Are there points in the code the reviewer needs to double check?

31c37c6c38 fixed this for closed MRs only. I had trouble understanding the introduced helper and logic, so reverted it and keyed everything on the existence of the source project or branch directly.

commits.json returns a 500 error for a closed or merged MR; the approach taken in the above MR was to hide the commits... tab, so I've run with that.

For merged MRs, the commits (but not the pipeline data) are in the target project, so we *could* do better, but it's a fairly nasty intervention to make it happen.

## Why was this MR needed?

Viewing merged MRs should work even if the fork they came from has been deleted or unlinked.

## Screenshots (if relevant)

![Screen_Shot_2016-10-19_at_17.56.37](/uploads/1aeadd5147b9a4ad29b946b1c7ea52cb/Screen_Shot_2016-10-19_at_17.56.37.png)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry 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?

Closes #23341

See merge request !6991
2016-10-20 14:03:10 +00:00
Dmitriy Zaporozhets 9180bdd445 Merge branch 'remove-unused-code-project-members-controller' into 'master'
Removed code from project members controller

## What does this MR do?

Removes code that was meant to be added to a different branch as an experiment.

See merge request !7012
2016-10-20 12:07:57 +00:00
Nick Thomas 6f846fcbe8 Fix two CI endpoints for MRs where the source project is deleted 2016-10-20 12:24:27 +01:00
Nick Thomas 374071321d Fix the merge request view when source projects or branches are removed 2016-10-20 12:24:27 +01:00
Sean McGivern 6f875903a0 Merge branch 'refactoring_find_commits_method' into 'master'
Refactoring find_commits method

It's possible that `find_commits_by_message` return nil in array which is not OK. We have different checks outside of this method. This MR places all checks inside the method.

See merge request !7000
2016-10-20 10:43:33 +00:00
Phil Hughes 50288a6ace Removed code from project members controller
This code was meant to be added to another branch as an expirement, but instead was commited to wrong branch
2016-10-20 11:35:29 +01:00
Valery Sizov fd2c3a3da0 Refactoring find_commits functionality 2016-10-20 12:45:34 +03:00
Phil Hughes fcf0a4a12d Merge branch 'master' into issue-board-sidebar 2016-10-19 22:33:34 +01:00
Douglas Barbosa Alexandre 007267ef8b Use `includes(:priorities)` on Projects::LabelsController 2016-10-19 14:58:27 -02:00
Douglas Barbosa Alexandre 530aae9080 Abstract LabelPriority away into methods on Label model 2016-10-19 14:58:27 -02:00
Douglas Barbosa Alexandre 86e0b5d643 Fix issue board related controllers to expose label priority per project 2016-10-19 14:58:27 -02:00
Douglas Barbosa Alexandre 67314e95ae Add support to group labels prioritization on project level 2016-10-19 14:58:27 -02:00
Douglas Barbosa Alexandre 6792644ae7 Use present? instead of presence on Projects::IssuesController#index 2016-10-19 14:58:26 -02:00
Douglas Barbosa Alexandre 247859c829 Render all available labels to project on project labels dropdown 2016-10-19 14:58:26 -02:00
Douglas Barbosa Alexandre bde992a83a Limit what label fields we expose on Projects::LabelsController#index 2016-10-19 14:58:26 -02:00
Douglas Barbosa Alexandre 933ebb8f9b Use present? instead of presence on Projects::MergeRequestsController 2016-10-19 14:58:26 -02:00
Douglas Barbosa Alexandre 0bfa39d5bd Remove scopes/types for labels 2016-10-19 14:58:25 -02:00
Douglas Barbosa Alexandre 1c73d302e2 Avoid an extra a query per label when setting label priority 2016-10-19 14:58:24 -02:00
Douglas Barbosa Alexandre baf47a0bd0 Remove project_labels from Projects::ApplicationController 2016-10-19 14:58:24 -02:00
Douglas Barbosa Alexandre bdb7bf4b51 List group labels on project labels page 2016-10-19 14:58:24 -02:00
Douglas Barbosa Alexandre bf9d928b45 Allow user to create a board list based on a group label 2016-10-19 14:58:24 -02:00
Douglas Barbosa Alexandre 398ab263fd Allow users to apply group labels on Issues/MRs 2016-10-19 14:58:24 -02:00
Fatih Acet d927336403 Merge branch '21444-pipeliens-new-mr' into 'master'
Add pipelines tab to new MR

#### What does this MR do?
Adds pipelines tab to new MRs

#### Screenshots (if relevant)
![Screen_Shot_2016-10-10_at_10.23.27_AM](/uploads/6c3f8f2be0cf9ba7cc78f6d918307ec0/Screen_Shot_2016-10-10_at_10.23.27_AM.png)
![Screen_Shot_2016-10-11_at_8.59.45_AM](/uploads/e67577d92327eafef6f04073f3d94212/Screen_Shot_2016-10-11_at_8.59.45_AM.png)

#### What are the relevant issue numbers?
Closes #21444

See merge request !6238
2016-10-19 16:14:46 +00:00
Rémy Coutable f0c7e6713f Merge branch '22191-delete-dynamic-envs-mr' into 'master'
Delete dynamic environments

- Adds "close environment" action to a merge request
- Adds tabs to environments list
- Adds close button to each environment row in environments list
- Replaces Destroy button with Close button inside an environment
- Adds close button to builds list inside an environment

#### Configuration

In order to enable stopping environments a valid `.gitlab-ci.yml` syntax has to be used:

```
review:
  environment:
    name: review/$app
    on_stop: stop_review

stop_review:
  script: echo Delete My App
  when: manual
  environment:
    name: review/$app
    action: stop
```

This MR requires that `stop_review` has to have: `when`, `environment:name` and `environment:action` defined.
The next MR after this one will verify that and enforce that these settings are configured.

It will also implicitly configure these settings, making it possible to define it like this:

```
review:
  environment:
    name: review/$app
    on_stop: stop_review

stop_review:
  script: echo Delete My App
```

Closes #22191 

See merge request !6669
2016-10-19 07:53:05 +00:00
Phil Hughes f1350a5c82 Merge branch 'master' into issue-board-sidebar 2016-10-19 08:44:55 +01:00
Grzegorz Bizon f7da506529 Extract pipeline vars in merge requests controller 2016-10-18 08:32:17 -05:00
Grzegorz Bizon db0e700d2f Use all pipelines variable when creating merge request 2016-10-18 08:32:17 -05:00
Grzegorz Bizon 27c762b8db Remove obsolete variable assigned to MR widget view 2016-10-18 08:32:17 -05:00
Kamil Trzcinski ad85928752 Add logical validation to gitlab-ci.yml 2016-10-18 12:22:51 +02:00
Kamil Trzcinski 0aa232704c Add `stop!` to `environment` 2016-10-18 12:02:50 +02:00
Kamil Trzcinski 66ff67b063 Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr 2016-10-18 11:56:48 +02:00
Kamil Trzcinski 829a708a97 Fix remaining specs failures 2016-10-18 11:32:11 +02:00
Lin Jen-Shin 88d988a2ed Merge remote-tracking branch 'upstream/master' into pipeline-emails
* upstream/master: (58 commits)
  Update endpoint to username validator
  change border color to variable
  Add todo for deprecated user routes and more information about deprecation to changelog
  Provide better error message to the user
  Apply better hierarchy to markdown headers and issue/mr titles
  Swapped button text manipulation outcomes for the toggle query
  Fixed find file keyboard navigation
  Update CHANGELOG for 8.12.7
  Added download-button class and applied button margin
  Enable activerecord_sane_schema_dumper for test
  Updated logo from @luke
  Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896
  Fix Test Env (proper error handling when gitlab-shell is not clonned)
  Fix randomly crashing spinach test for merge request
  [Great spinach fix] Replace gsub with delete
  Remove carriage returns from commit description as summary is on a newline and will always include carriage returns
  Convert due_date_select.js filetype to es6.
  Stop directly parsing due_date with Date.parse, prefer parsing implicitly.
  Improve spec for pipeline metrics worker
  Add Pipeline metrics worker
  ...
2016-10-18 08:15:13 +00:00
Kamil Trzcinski 34e19b9b8d Fix specs 2016-10-17 22:01:56 +02:00
Kamil Trzcinski e988072207 Fix environments specs 2016-10-17 21:06:10 +02:00
Kamil Trzcinski 9b790f1cf9 Improve after code review 2016-10-17 16:13:19 +02:00
Kamil Trzcinski 50d3cc2b67 Remove destroy from environments [ci skip] 2016-10-17 15:40:18 +02:00
Kamil Trzcinski 6cdbb27ec3 Refactor code to use available and stopped statuses and refactor views to use separate renders 2016-10-17 12:45:31 +02:00
Sean McGivern 86dcb79be3 Merge branch 'master' into merge-conflicts-editor-2 2016-10-17 10:56:55 +01:00
Kamil Trzcinski db9c03bf44 Add environment stop action [ci skip] 2016-10-17 11:38:43 +02:00
Kamil Trzcinski 40528a1326 Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr 2016-10-17 11:24:51 +02:00
Lin Jen-Shin 09a7da7222 Merge remote-tracking branch 'upstream/master' into pipeline-emails
* upstream/master: (148 commits)
  Fix broken rspec in compare text
  Added logic to handle a revision input that does not exist in the menu
  Fix broken Spinach tests caused by changes in !6550
  Convert CHANGELOG to Markdown
  Fix active tab test for branches page
  Fix merge requests feature tests
  Wait for ajax call in merge request unsubscribe test
  Fix 500 error when creating mileston from group page
  Fix 404 when group path has dot in the name
  Add the tech writers usernames in the doc_sytleguide doc
  Fix broken SCSS linter errors due to missing newlines
  Fix Hash syntax to work for both Ruby 2.1 and 2.3
  Fix Spinach merge request diff failures
  remove ashley since she no longer works here
  Revert "Improve tabbing usability for sign in page"
  Don't use member properties in users_spec, and remove loading ref.
  Clean up stray Sign up ref.
  Back off the array spreading, bc poltergeist freaks out.
  Convert dispatcher to es6.
  Add exists to users routes and fix endpoint.
  ...
2016-10-17 07:20:52 +00:00
Fatih Acet 66855f6262 Merge branch 'members-ui' into 'master'
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-14 12:25:23 +00:00
Lin Jen-Shin dc1d269f67 Merge remote-tracking branch 'upstream/master' into pipeline-emails
* upstream/master: (237 commits)
  Grapify boards API
  Add test, fix merge error
  Use local assigns to get the dropdown title
  Updated issuable dropdown titles
  Added safety check for formatted values
  Minor style improvement
  Fixed conflict and corrected teaspoon test
  Rename method in test
  Moved ci_status environments logic to new action ci_envrionments_status and set up frontend polling
  Refactor ci_status on MergeRequestController
  Fix indenting error in HAML
  Show what time ago a MR was deployed
  Fixed missing links
  Fixed missing links
  Refactor merge requests revisions
  Add link to update docs for source installations
  Grapify todos API
  Link to review apps example from docs
  fix grafana_configuration.md move link
  Do not run before_script, artifacts, cache in trigger_docs job
  ...
2016-10-14 11:31:10 +00:00