Commit Graph
25617 Commits
Author SHA1 Message Date
Rubén Dávila cbdbbcbc4f Check if index exists before adding it. [ci skip]
* I got an error when updating GDK because it already exists.
2016-03-21 21:17:23 -05:00
Robert Speicher 3a78f7caa0 Merge branch 'issue_12658' into 'master'
Add group visibility level

Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3051

Closes #12658

See merge request !3323
2016-03-22 01:24:52 +00:00
Douwe Maan 503244eb96 Fix specs 2016-03-22 00:23:58 +01:00
Douwe Maan 31266c5be4 Address feedback 2016-03-22 00:09:20 +01:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
2016-03-21 23:22:21 +01:00
Felipe Artur 8d544645f0 Add specs and add visibility level to admin groups 2016-03-21 19:11:24 -03:00
Jacob Schatz 0305dd98b3 Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master'
change the css class has_tooltip to has-tooltip universally

closes #14432 

See merge request !3321
2016-03-21 20:40:14 +00:00
Jacob Schatz be039601be Merge branch 'css-indentation' into 'master'
Fix Indentation lints in CSS.

As discussed in #14299.

cc: @jschatz1 

See merge request !3312
2016-03-21 20:11:00 +00:00
Jacob Schatz 355d3119fd Merge branch 'ssh-page-ago' into 'master'
Remove duplicated ago

Closes #14460 

See merge request !3332
2016-03-21 19:50:14 +00:00
Jacob Schatz 16b44f7184 Merge branch 'project-icon' into 'master'
Changing project icon

Closes #14196

See merge request !3268
2016-03-21 19:33:57 +00:00
Jacob Schatz e210438eac Merge branch 'css-shorthand' into 'master'
Follow the CSS Style Guide rules for using shorthand where possible.

Fixes violations of the Shorthand rule. All of these were done manually and I reviewed each change to verify, so they should all be right.

Discussed in #14299.

cc: @jschatz1 

See merge request !3313
2016-03-21 19:32:23 +00:00
Douwe Maan 4a16802615 Merge branch '2489-soft-delete-issues' into 'master'
Soft delete issuables

Fixes #2489 

What still needs to happen: research on the indexes, the gem suggests a [lot of changes](https://github.com/rubysherpas/paranoia#about-indexes) though this is probably a good idea to discuss and I'm unsure on the impact of an omnibus upgrade as I suspect creating about 10 new indexes has a large impact on the downtime.

TODO: 
- [x] Also group owners can ***soft*** delete
- [x] Button should be hidden

See merge request !2982
2016-03-21 19:28:48 +00:00
Douwe Maan 642f56c646 Merge branch 'fix/safe-import-url' into 'master'
Prevent tokens in the import URL to be showed by the UI

Quick fix to prevent the import URL to show a user's token.

See merge request !3331
2016-03-21 18:51:17 +00:00
Zeger-Jan van de Weg 6e5461c6ee Merge branch 'master' into 2489-soft-delete-issues 2016-03-21 19:32:37 +01:00
Zeger-Jan van de Weg d28a587e82 Fix typos and denting 2016-03-21 19:30:45 +01:00
Robert Schilling f9b942259c Remove duplicated ago 2016-03-21 19:11:32 +01:00
James Lopez 2fe80e94ad updated changelog 2016-03-21 18:53:55 +01:00
James Lopez cae864a12e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/safe-import-url 2016-03-21 18:52:55 +01:00
James Lopez 4196ee0661 update safe_import_url to prevent tokens to be showed by the UI 2016-03-21 18:52:21 +01:00
Jacob Schatz 2bcbc7c6db Merge branch 'remove-console-log' into 'master'
Remove console.log call



See merge request !3322
2016-03-21 16:36:00 +00:00
Zeger-Jan van de Weg 3b088fc5b5 Minor improvements on IssuableActions 2016-03-21 16:59:35 +01:00
Robert Speicher ffc3acd498 Merge branch 'issues-show-performance' into 'master'
Improve performance of viewing individual issues

This MR does two things:

1. `Issue#related_branches` no longer performs Git operations that aren't needed
2. The output of `Repository#exists?` is now cached and flushed properly

Combined these two changes should further cut down the amount of Git operations performed when viewing individual issues (and possibly other pages).

See merge request !3296
2016-03-21 14:42:25 +00:00
Kamil Trzciński 3fca30d27f Merge branch 'feature/issue-move' into 'master'
Ability to move issue to another project

Tasks:

- [x] Create scaffold of service that will move issue to another project.
- [x] Close old issue, add system note about moving issue to a new project.
- [x] Create a new issue, add system note about issue being moved from old project.
- [x] Check if issue can be moved to another project before executing service
- [x] Check permissions when moving an issue (`:admin_issue` ability)
- [x] Display select box for a new project when editing an issue
- [x] Show only projects that issue can be moved into in that select box
- [x] Add project select handler, helper and some permission filters to it
- [x] Preserve as much information as possible, including author
- [x] Prepare mechanisms that unfolds local references in issue description
- [x] Rewrite issue description with references unfolding and add some specs for it
- [x] Rewrite all system notes and comments attached to issue that is being moved
- [x] Update `Label` so that is was able to create cross reference labels (separate MR)
- [x] Add notifications about moving issue to another project
- [x] Display confirmation alert/message when issue move has been requested
- [x] Make it possible to undo selecting project where issue will be moved to
- [x] Add column to issue, that will indicate if it has been moved to another project
- [x] Do not allow to move issue that has been already moved
- [x] Write top-to-bottom feature spec in RSpec instead of Spinach

UI:

![issue_move_ui](/uploads/b3c6b563362c1fded9082cc0f51e5a74/issue_move_ui.png)

![issue_move_tooltip](/uploads/2ab913b06f52df1cafde9abe89bd9cb8/issue_move_tooltip.png)

Closes #3024

See merge request !2831
2016-03-21 14:01:19 +00:00
Rémy Coutable bfcdb47c40 Merge branch 'workhorse-0.7.1' into 'master'
Use gitlab-workhorse 0.7.1

A small extra defense against interrupted git raw responses. Nice to
have in 8.6 because we introduce /raw/ caching; it would be
unfortunate if incorrect (truncated) responses got cached.

See merge request !3330
2016-03-21 13:40:20 +00:00
Dmitriy Zaporozhets 08a892b095 Merge branch 'fix-image-mode-view-diff' into 'master'
Fix diff image view modes (2-up, swipe, onion skin) not working

Example test case: https://gitlab.com/mrtzcspr/test/commit/5d983226b1308d98ef3d8919b978ad49f34496b8

Closes #13856

See merge request !3316
2016-03-21 13:38:30 +00:00
Dmitriy Zaporozhets cbc076256d Merge branch 'rs-use-kaminari-default' into 'master'
Use the configured Kaminari "per page" default

Configured in [`config/initializers/kaminari.rb`](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/initializers/kaminari_config.rb).

See merge request !3320
2016-03-21 13:17:27 +00:00
Grzegorz Bizon db8f70d508 Do not rewrite reference if already a cross reference 2016-03-21 14:12:49 +01:00
Jacob Vosmaer 016c6da7c6 Gitlab-workhorse tags have "v" now 2016-03-21 13:13:34 +01:00
Jacob Vosmaer 3d750563d2 Use gitlab-workhorse 0.7.1 2016-03-21 13:09:23 +01:00
Rémy Coutable 17de30f412 Merge branch 'backport-ee-premailer' into 'master'
Backport premailer and diff changes from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151

See merge request !3318
2016-03-21 10:46:37 +00:00
Yorick Peterse 75aaf91cb1 Create SSH keys for SSH clone Spinach tests
These tests would check if the "This project is empty" banner would
contain SSH clone URLs. Oddly enough this should have never passed (as
far as I can tell) as SSH clone URLs in this banner are _only_ displayed
if the current user has at least 1 SSH key attached. Since the tests
never seem to create any they never should have passed, yet somehow they
did. To solve this the Spinach tests in question now ensure at least 1
SSH key is present.
2016-03-21 11:40:13 +01:00
Phil Hughes debc882cad Updated other views with new project icon 2016-03-21 10:08:00 +00:00
Phil Hughes 310f9fcd7b Group page now uses correct project icon
Closes #14196
2016-03-21 10:04:15 +00:00
Douwe Maan 261569b246 Fix specs 2016-03-21 09:09:59 +01:00
Robert Speicher b9fb48bc45 Merge branch 'upgrade-rubocop' into 'master'
Upgrade Rubocop from 0.35.1 to 0.38.0

See [Rubocop's Releases page](https://github.com/bbatsov/rubocop/releases) for more info on what changed.

Descriptions/StyleGuides removed as discussed in #14233.

Changes:
- Enable DisplayCopNames for lint output.
- Default behavior for `Alias` changed, set to enforce `prefer_alias_method`.
- Enabling Rails cops changed to new syntax.
- Remove StyleGuides and move Descriptions to comments.
- Add missing cops.
- Add TODOs for cops that should be enabled in the future.
- Set TargetRubyVersion to 2.1.

See merge request !3197
2016-03-21 06:09:02 +00:00
connorshea 6274136c9a Update Rubocop from 0.35.1 to 0.38.0.
Discussed in #14233.

See [their releases](https://github.com/bbatsov/rubocop/releases) for
more info.

Changes:
- Enable DisplayCopNames for lint output.
- Default behavior for `Alias` changed, set to enforce `prefer_alias_method`.
- Enabling Rails cops changed to new syntax.
- Remove StyleGuides and move Descriptions to comments.
- Add missing cops.
- Add TODOs for cops that should be enabled in the future.
- Set TargetRubyVersion to 2.1.
2016-03-20 20:49:12 -06:00
Douwe Maan b689e2c0e0 Fix spec 2016-03-21 00:42:30 +01:00
Douwe Maan 45e8650c4f Fix specs 2016-03-20 23:26:58 +01:00
Douwe Maan 19aa20d528 Fix more specs 2016-03-20 23:09:33 +01:00
Douwe Maan 7c51d5efec Fix some specs 2016-03-20 22:55:08 +01:00
Arinde Eniola 367818d293 change the css class has_tooltip to has-tooltip universally 2016-03-20 21:37:22 +01:00
Douwe Maan 3058a8fa4c Fix "Shared projects" tab 2016-03-20 21:30:08 +01:00
Douwe Maan fd8d44ca61 Fix group project selection in IssuableFinder 2016-03-20 21:14:39 +01:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Jacob Schatz d19abe6f65 Merge branch 'css-zero-unit-again' into 'master'
Fix a few remaining uses of `0px`.

See #14299 for more information.

cc: @jschatz1 

See merge request !3310
2016-03-20 19:33:04 +00:00
Stan Hu e79f4a79a4 Remove console.log call 2016-03-20 10:58:59 -07:00
Jacob Schatz 42fc4233e5 Merge branch 'fix-default-http-clone' into 'master'
Make HTTP(s) label consistent on clone bar

Sites that use http:// for the external_url should always display HTTP on
the clone bar. Similarly, sites that use https:// should show HTTPS.

Currently, the inconsistency looks like:

![http-magic](/uploads/945fda580f7ba5aee36cc572b49baf2b/http-magic.gif)

Also restores the tooltips that vanished in 7ba4482fcf:

![image](/uploads/b5a7b3e68b4992a447fcaa51915e866c/image.png)


See merge request !3319
2016-03-20 17:52:20 +00:00
Grzegorz Bizon 91963267a0 Change icon and cursor for issue move field tooltip 2016-03-20 17:38:08 +01:00
Grzegorz Bizon d6474f22d2 Preserve created at time of notes when moving issue 2016-03-20 17:05:21 +01:00
Jacob Schatz a4422a3a2e Merge branch 'edit-form-alignment' into 'master'
Fix spacing below edit note form

Also changed to allow the CSS to decide what should be hidden when editing

Thanks @JobV for having eagle eyes 😜 

See merge request !3306
2016-03-20 15:54:49 +00:00