Commit Graph
8527 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d63371ad78 Update controller filters
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 16:44:21 +02:00
Dmitriy Zaporozhets 342d553709 Rename abilities to correspond contoller/model action names
write_ was renamed to create_
modify_  was renamed to update_

So now in update action we have next code

def create
  can?(current_user, :create_issue, @issue)
end

def update
  can?(current_user, :update_issue, @issue)
end

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:55:56 +02:00
Dmitriy Zaporozhets d5947ada44 Simplify set of assignee, milestone and label to admin_issue rule
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:45:45 +02:00
Dmitriy Zaporozhets b9fa82daee Update tests and use js-issuable class for context form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:05:30 +02:00
Dmitriy Zaporozhets a9095280c7 UsersSelect is part of filter so I rather keep js executed in partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:54:35 +02:00
Dmitriy Zaporozhets cbb64a4f63 Fix js error on merge request page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:37:52 +02:00
Dmitriy Zaporozhets 0bcfe9a0dc Dont allow set assignee, milestone or labels if user is guest
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:17:48 +02:00
Dmitriy Zaporozhets 5ff870a044 Move duplicate js functionality into IssuableForm
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:17:06 +02:00
Dmitriy Zaporozhets 2d31568b27 Refactor issue and merge request sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:04:50 +02:00
Dmitriy Zaporozhets d315d1eba4 Dont allow guest to set assigne, milestone and label when create new issue or merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 15:38:04 +02:00
Dmitriy Zaporozhets 60baa1e866 Move issuable partials in common directory
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 15:11:22 +02:00
Dmitriy Zaporozhets 6288677134 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-25 13:33:50 +02:00
Douwe Maan 7b804e231a Have sidebar labels disappear behind content instead of hide immediately. 2015-06-25 11:42:15 +02:00
Job van der Voort 0429a24066 prettier highlighting of active link in the sidebar 2015-06-25 11:19:56 +02:00
Dmitriy Zaporozhets 9c0229732a Merge branch 'rs-random-placeholder-tip' into 'master'
Show a random Markdown tip in the textarea placeholder

cc @darby

See merge request !879
2015-06-25 08:59:54 +00:00
Dmitriy Zaporozhets 87fa392d7f Merge branch 'project_icon_removal' into 'master'
Removed the icons from the New Issue and New Project buttons

Fixes #1869

No more icons!

See merge request !885
2015-06-25 08:38:30 +00:00
Dmitriy Zaporozhets 0c8b96bdbc Merge branch 'performance-improvements' into 'master'
Performance improvements

* store @participants in variable
* store result of subscribed? call into variable

In total it reduce amount of SQL queries for issue or merge_request with 10 comments/participants almost twice.

See merge request !883
2015-06-25 08:14:03 +00:00
Robert Speicher 09f2bec64c Prefix random Markdown tips with "Tip:" 2015-06-24 18:43:57 -04:00
Darby e94e23617a Removed the icons from the New Issue and New Project buttons 2015-06-24 11:48:04 -07:00
Adam Meily 0cf2e62fb2 Updated merge request merged web hook to correctly fire action=merged.
Fixes #879
Fixes #498
2015-06-24 10:15:18 -04:00
Dmitriy Zaporozhets 7aa8e12c54 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-24 13:59:01 +02:00
Dmitriy Zaporozhets c7a7341b5b Merge branch 'explicit_error_ci' into 'master'
Explicit error when commit not found in the GitLab CI

!!! SHOULD BE MERGED WITH https://gitlab.com/gitlab-org/gitlab-ci/merge_requests/159

https://dev.gitlab.org/gitlab/gitlab-ci/issues/280

See merge request !871
2015-06-24 11:32:47 +00:00
Dmitriy Zaporozhets 9da229adc6 Merge branch 'stop-jumping' into 'master'
stop jumping all content on collapsing and expanding the sidebar

When you collapse or expand the sidebar, all content shifts with 5px.

This merge request solves that.

cc @darby

See merge request !1877
2015-06-24 11:13:49 +00:00
Dmitriy Zaporozhets a3f64b195e Improve performance for merge_request#show page
* store @participants in variable
* store result of subscribed? call into variable

In total it reduce amount of SQL queries for merge_request with 10
comments/participants twice.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-24 12:56:10 +02:00
Dmitriy Zaporozhets a5f23435f7 Improve performance for issue#show page
* store @participants in variable
* store result of subscribed? call into variable

In total it reduce amount of SQL queries for issue with 10 comments/participants twice.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-24 12:49:34 +02:00
Dmitriy Zaporozhets c83bbfa79e Enable rack profiler by default
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-24 12:48:59 +02:00
Douwe Maan 43b444f40a Merge branch 'rs-issue-1850' into 'master'
Only look up Commit authors/committers by email

- Removes looking up authors/committers by name
- Renames `User.find_for_commit` to `User.find_by_any_email`

Closes #1850

See merge request !878
2015-06-24 09:47:13 +00:00
Job van der Voort b9fc3c19f8 stop jumping all content on collapsing and expanding the sidebar 2015-06-24 11:20:36 +02:00
Dmitriy Zaporozhets ffe974020e Merge branch 'application_settings_form' into 'master'
Updated the categories of Application Settings Form

Changed the categories and order of the application settings accessible by admin/application_settings

Link to issue: https://dev.gitlab.org/gitlab/gitlabhq/issues/2412
Issue will be closed upon approval of this merge request.

Fixes #2412

See merge request !877
2015-06-24 08:50:35 +00:00
Robert Speicher 7e4829c3e9 Allow user to remove public email address 2015-06-23 21:22:00 -04:00
Robert Speicher 82a671704d Show a random Markdown tip in the textarea placeholder 2015-06-23 21:00:10 -04:00
Darby f0c4f0a5d4 Changed the placement of Restricted Domains 2015-06-23 15:54:33 -07:00
Robert Speicher e9b65a3e05 Only look up Commit authors/committers by email
- Removes looking up authors/committers by name
- Renames `User.find_for_commit` to `User.find_by_any_email`
2015-06-23 18:07:15 -04:00
Darby 4cd3c33024 Updated the categories of Application Settings Form 2015-06-23 14:39:04 -07:00
Dmitriy Zaporozhets 94f130cbfc Merge branch 'admin-edit-identities' into 'master'
Admin can see, edit and remove user identities

Related to #1415 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2224

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !843
2015-06-23 14:24:16 +00:00
Dmitriy Zaporozhets b51fe68311 Merge branch 'fix-delete-user-error' into 'master'
Fix error when deleting a user who has projects

### What does this MR do?

This MR fixes an error that prevented users from being deleted in the Admin page if the user had personal projects.

### Why was this MR needed?

Deleting a user who had projects would result in an error such as this:

```
Started DELETE "/admin/users/tdb1" for MYIP at 2015-06-22 20:53:02 +0100
Processing by Admin::UsersController#destroy as HTML
Parameters: {"authenticity_token"=>"[FILTERED]", "id"=>"tdb1"}
Completed 500 Internal Server Error in 30ms (ActiveRecord: 6.7ms)

NameError (undefined local variable or method `current_user' for #<DeleteUserService:0x0000000cd01d38>):
app/services/delete_user_service.rb:10:in `block in execute'
app/services/delete_user_service.rb:7:in `execute'
app/controllers/admin/users_controller.rb:89:in `destroy'
```

### What are the relevant issue numbers?

* Closes #1856
* Closes https://github.com/gitlabhq/gitlabhq/issues/9394

See merge request !868
2015-06-23 13:36:43 +00:00
Douwe Maan 1cfdc7a63b Merge branch 'fix-issue-1771-2' into 'master'
Fixed invalid timestamps in RSS feed #1771

Fixed invalid timestamps in RSS feed by using rfc3339 #1771

See merge request !870
2015-06-23 11:59:03 +00:00
Valery Sizov af93d447b6 Explicit error when commit not found in the GitLab CI 2015-06-23 14:50:06 +03:00
Stan Hu e80d7a804f Fix error when deleting a user who has projects
Closes #1856
Closes https://github.com/gitlabhq/gitlabhq/issues/9394
2015-06-23 04:39:49 -07:00
Rowan Wookey cacc955acc Fixed invalid timestamps in RSS feed #1771 2015-06-23 11:32:26 +01:00
Dmitriy Zaporozhets 8c6cbd4306 Merge branch 'master' into admin-edit-identities 2015-06-23 12:09:45 +02:00
Dmitriy Zaporozhets 21e227d870 Validate presence of provider field in Identity
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-23 11:21:23 +02:00
Dmitriy Zaporozhets 7780a886e7 Set proper title when edit identity from admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-23 10:56:12 +02:00
Dmitriy Zaporozhets 615257b91c Merge branch 'animation-sidebar' into 'master'
Animation of Sidebar (video in here)

Edited the CSS of header and sidebar; added a new div of gitlab-logo-container to the html to make things easier.

The transition-duration is set to 0.3s and when the nav bar expands, it opens up over the text, essentially revealing hidden text.

[animation-sidebar-2.mov](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b15996a256d6bed03a19c68549d116e4/animation-sidebar-2.mov)

/cc @JobV @nicolas2

See merge request !849
2015-06-23 08:53:31 +00:00
Dmitriy Zaporozhets f189c36d8d Merge branch 'rs-dev-issue-2414' into 'master'
Allow Admin to filter users by 2FA status

> ![Screen_Shot_2015-06-19_at_4.38.12_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/deba7f2a6b8d1548c1d1ac401e0e35a1/Screen_Shot_2015-06-19_at_4.38.12_PM.png)

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414

See merge request !852
2015-06-23 08:48:22 +00:00
Dmitriy Zaporozhets 1beb0dbe56 Fix admin identities code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-23 10:26:50 +02:00
Robert Speicher dcfce8b198 Use alias_attribute to define User#two_factor_enabled 2015-06-22 21:14:07 -04:00
Darby 95e2ca7630 fixed the resizing icon issue 2015-06-22 12:03:16 -07:00
Dmitriy Zaporozhets 7390b94db2 Fix code style issue
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 18:02:50 +02:00
Dmitriy Zaporozhets d7553d3630 Address review comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 18:01:52 +02:00