Commit Graph
8955 Commits
Author SHA1 Message Date
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
Stan Hu 774b7ee277 Fix Error 500 when relative submodule resolves to a namespace that has a different name from its path
Closes #1849
2015-06-23 05:49:19 -07: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
Dmitriy Zaporozhets 73e003013f Merge branch 'master' into admin-edit-identities
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/admin/users/show.html.haml
2015-06-22 18:00:11 +02:00
Dmitriy Zaporozhets 3fe3cbf222 Fix indendity test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 17:52:22 +02:00
Dmitriy Zaporozhets cc04c5b828 Refactor admin user page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 17:12:20 +02:00
Dmitriy Zaporozhets b21390936a Make provider a select for identities form in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 16:53:11 +02:00
Dmitriy Zaporozhets 8f89a48847 Minor improvements to admin identities text
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 16:52:06 +02:00
Dmitriy Zaporozhets cc9b5c49d1 Merge branch 'revert-mr-state-names'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/merge_requests.rb
2015-06-22 15:43:09 +02:00
Dmitriy Zaporozhets 7bee9ce10e Merge branch 'see-full-size-avatar' into 'master'
Link an users avatar to the fullsize version

When we want to see the fullsize avatar of a user we can click the avatar on the profile page and the fullsize version will be opened in a new window/tab.

See merge request !415
2015-06-22 13:21:17 +00:00
Dmitriy Zaporozhets d3978e0b27 Merge branch 'remove_unused_except' into 'master'
projects doesn't seem to be a valid action in this controller

Hi,

This is just a tiny change. Let me know if I'm doing it wrong...

Eaden

See merge request !696
2015-06-22 13:20:14 +00:00
Dmitriy Zaporozhets 595b3323a8 Merge branch 'rs-rspec3' into 'master'
RSpec3

Upgrades rspec to 3.3.0, we're now up-to-date! 🎉

See merge request !831
2015-06-22 13:15:27 +00:00
Dmitriy Zaporozhets 6c4d48b8b9 Merge branch 'rs-remove-link-to-override'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	spec/helpers/application_helper_spec.rb
2015-06-22 12:26:41 +02:00
Dmitriy Zaporozhets 9179dc6dc8 Merge branch 'new-logo' into 'master'
Replace old logo with new one

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

cc @JobV @sytses

See merge request !848
2015-06-22 10:18:51 +00:00
Robert SpeicherandDmitriy Zaporozhets 2120e2dd95 Replace remaining references to Note.create_cross_reference_note 2015-06-22 12:13:46 +02:00
Robert SpeicherandDmitriy Zaporozhets 5a9ede4721 Update mock and stub syntax for specs 2015-06-22 12:13:46 +02:00
Dmitriy Zaporozhets 75f7a9648e Merge branch 'web-editor-autocrlf' into 'master'
Convert CRLF newlines to LF when committing using the web editor.

Fixes #1823 and https://github.com/gitlabhq/gitlabhq/issues/7950.

Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/29 being merged and a new gitlab_git being released.

cc @jacobvosmaer

See merge request !858
2015-06-22 10:11:26 +00:00
Dmitriy Zaporozhets eb972b71d0 Fix closed merge request scope at milestone page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22 12:10:52 +02:00
Dmitriy Zaporozhets 29b6d465a7 Merge branch 'rs-dev-issue-2355' into 'master'
MergeRequest#show performance improvements

This is a first pass on improving the performance of the `MergeRequests#show` page. Notable changes:

- The "Commits" tab is loaded lazily, so the initial page load should be much faster for MRs with many commits.
- Relative timestamps via `timeago` are only initialized once per load instead of `O(n^2)`. This greatly improves frontend rendering times for a large number of commits.
- Refactored `User.find_for_commit` to use a single ARel-generated SQL query instead of the old method which resulted in one query, and could result in up to three.

See merge request !838
2015-06-22 09:48:49 +00:00
Dmitriy Zaporozhets ea9dda9541 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-22 11:26:33 +02:00
Robert Speicher e17020b907 Add MergeRequestTabs specs 2015-06-21 22:57:32 -04:00
Robert Speicher 8e72c65cda Minor style fixes in MergeRequestTabs 2015-06-21 18:57:04 -04:00
Robert Speicher d3ff8c1a95 Make default value for otp_required_for_login false instead of null 2015-06-20 19:40:48 -04:00
Douwe Maan 0734756ee4 Convert CRLF newlines to LF when committing using the web editor. 2015-06-20 14:35:24 +02:00
Douwe Maan c0df5ff126 Merge branch 'snippet_optional_filename' into 'master'
Make snippet filename optional.

Fixes #2384.

See merge request !1866
2015-06-20 10:47:06 +00:00