Filipa Lacerda
1b48285801
Merge branch 'mr-widget-deployment-styling' into 'master'
...
Fix styling of multiple environments in merge request widget
Closes #40610
See merge request gitlab-org/gitlab-ce!17663
2018-03-14 12:06:28 +00:00
Phil Hughes
a4a893eaa8
fixed deployment rspec
2018-03-14 10:02:05 +00:00
Simon Knox
8fa001e760
Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)"
2018-03-13 12:01:36 +00:00
Phil Hughes
2475019b4a
Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'
...
Fix "Remove source branch" button in MR widget during MWPS state
Closes #42814 and #4281
See merge request gitlab-org/gitlab-ce!17192
2018-03-12 12:14:02 +00:00
Eric Eastwood
aba1c07a3e
Fix "Remove source branch" button in MR widget during MWPS state
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/4281
2018-03-08 14:44:25 -06:00
Phil Hughes
e091352bff
added rspec test to test when user cant merge
2018-03-08 14:42:13 +00:00
Phil Hughes
28155c9580
Dont show remove source branch checkbox when user cannot remove the branch
...
Closes #33264
2018-03-08 13:33:59 +00:00
Bob Van Landuyt
cfa9d1ed6b
Only allow users that can merge to push to source
...
We only allow users that can merge the merge request to push to the
fork.
2018-03-07 17:00:50 +01:00
Bob Van Landuyt
9aabd8fd5e
Limit queries to a user-branch combination
...
The query becomes a lot simpler if we can check the branch name as
well instead of having to load all branch names.
2018-03-07 16:59:17 +01:00
Bob Van Landuyt
e74879280f
Allow maintainers to edit directly in a fork
2018-03-07 16:55:34 +01:00
Bob Van Landuyt
792ab0631c
Allow a user to select allow maintainer to push
...
When a project is not private, and the source branch not protected the
user can now select the option to allow maintainers to push to this
branch
2018-03-07 15:12:31 +01:00
Fatih Acet
059ab73b8e
Render MR Notes with Vue with behind a cookie
2018-02-28 00:10:43 +00:00
Filipa Lacerda
e03c85b981
Merge branch 'master' into fl-mr-widget-1
...
* master: (38 commits)
Added more tests and corrected typos
Ban Rugged from Repository
Improve doc/development/automatic_ce_ee_merge.md
fixed infinite loop crashing tests
Converted todos.js to axios
Converted usage_ping.js to use axios
Converted pager.js to axios
Converted notifications_form.js to axios
Converted notes.js to axios
Converted branch_graph.js to axios
Converted mini_pipeline_graph_dropdown.js to axios
Include subgroup issuables on the group page
Remove grpc and google-protobuf platform-specific version markers in Gemfile.lock
Replace $.ajax in find file with axios
Replace $.ajax in activity calendar with axios
Remove namespaced internationalization import
Fix subgroup creation docs
Fix a JSON schema that doesn't include enough fields
Make user/author use project.creator in most factories
Enable RuboCop Style/RegexpLiteral
...
2018-02-01 17:53:26 +00:00
Robert Speicher
d974ddb70e
Merge branch '36009-user-default-project-creator-in-factories' into 'master'
...
Make user/author use project.creator in most factories
Closes #36009
See merge request gitlab-org/gitlab-ce!13321
2018-02-01 16:11:56 +00:00
Filipa Lacerda
c8a17cd1bd
Update spec to match link being changed into a button
2018-02-01 15:16:34 +00:00
Rémy Coutable
a2718ebaff
Make user/author use project.creator in most factories
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-31 18:31:21 +01:00
Takuya Noguchi
2b6307f6ad
Enable RuboCop Style/RegexpLiteral
2018-02-01 02:06:07 +09:00
Nick Thomas
93ea3234df
Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'
2018-01-24 17:25:55 +00:00
Rémy Coutable
799cd47109
Improve MR feature specs and reduce duplication
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-18 15:07:57 +01:00
