Commit graph

18 commits

Author SHA1 Message Date
GitLab Bot
9865665cb1 Add latest changes from gitlab-org/gitlab@master 2019-10-08 12:06:01 +00:00
Oswaldo Ferreira
ca884980ee [CE] Support multiple assignees for merge requests
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
2019-04-08 18:40:00 -03:00
Douglas Barbosa Alexandre
d403d7ac6c Fix MR sidebar to correctly warning if assignee can't merge 2019-01-08 21:50:36 +00:00
Heinrich Lee Yu
9f9765485e Refactor sidebar to use data from serializer 2018-12-19 17:58:53 +08:00
Bob Van Landuyt
f1d3ea63cf Show the status of a user in interactions
The status is shown for
- The author of a commit when viewing a commit
- Notes on a commit (regular/diff)
- The user that triggered a pipeline when viewing a pipeline
- The author of a merge request when viewing a merge request
- The author of notes on a merge request (regular/diff)
- The author of an issue when viewing an issue
- The author of notes on an issue
- The author of a snippet when viewing a snippet
- The author of notes on a snippet
- A user's profile page
- The list of members of a group/user
2018-07-30 15:01:26 +02:00
Lin Jen-Shin
4ee08b77bc Updates from rubocop -a 2018-07-09 21:13:08 +08:00
Jan Provaznik
27a75ea175 Backport 'Rebase' feature from EE to CE
When a project uses fast-forward merging strategy user has
to rebase MRs to target branch before it can be merged.
Now user can do rebase in UI by clicking 'Rebase' button
instead of doing rebase locally.

This feature was already present in EE, this is only backport
of the feature to CE. Couple of changes:
* removed rebase license check
* renamed migration (changed timestamp)

Closes #40301
2018-01-05 09:34:59 +01:00
Bob Van Landuyt
e8ca579d88 Add a project forks spec helper
The helper creates a fork of a project with all provided attributes,
but skipping the creation of the repository on disk.
2017-10-07 11:46:23 +02:00
Sean McGivern
5883ce95ef current_application_settings belongs on Gitlab::CurrentSettings
The initializers including this were doing so at the top level, so every object
loaded after them had a `current_application_settings` method. However, if
someone had rack-attack enabled (which was loaded before these initializers), it
would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't
have that method.

To fix this:

1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need
   `Object.new.current_application_settings` to work.
2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it
   like that in several places.
3. Change the initializers to use that new form.
2017-08-31 13:38:33 +01:00
Robert Speicher
985a0c39ef Use Project :repository trait where necessary in view specs 2017-03-27 18:45:37 -04:00
Mike Greiling
6e7e505237 include all expected instance vars for _show.html.haml template within tests 2017-01-03 13:08:52 -06:00
Katarzyna Kobierska
1b547cfba8 Improve grammar 2016-09-30 11:28:05 +02:00
Katarzyna Kobierska
25edb0709c Close merge request if open without source project 2016-09-30 11:28:05 +02:00
Connor Shea
8062380f60 Upgrade Devise from 4.1.1 to 4.2.0.
This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release.

This also replaces the deprecated Devise::TestHelpers with Devise::Test::ControllerHelpers.

Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01
2016-09-27 20:08:49 -06:00
Katarzyna Kobierska
8ed6e2ec7a Fix test 2016-08-30 13:05:40 +02:00
Katarzyna Kobierska
6b02c82cfe Improve grammar 2016-08-30 13:05:40 +02:00
Katarzyna Kobierska
2e08f11569 Improve code 2016-08-30 13:05:40 +02:00
Katarzyna Kobierska
c9c2503c51 User can edit closed MR with deleted fork
Add test for closed MR without fork

Add view test visibility of Reopen and Close buttons

Fix controller tests and validation method

Fix missing space

Remove unused variables from test

closed_without_fork? method refactoring

Add information about missing fork

When closed MR without fork can't edit target branch

Tests for closed MR edit view

Fix indentation and rebase, refactoring
2016-08-30 13:05:40 +02:00