Commit Graph
4837 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 1beb0dbe56 Fix admin identities code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-23 10:26:50 +02: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 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 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
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
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
Douwe Maan 0795698162 Merge branch 'new-mr-disable-change-target-branch' into 'master'
Disable changing of target branch in new merge request page when a branch has already been specified

### What does this MR do?

This MR prevents a user from changing the target branch inside a new merge request page if the target branch has already been specified (e.g. from the shortcut in the activity feed). A link to "Change branches" is provided to allow the user to do this properly.

### Why was this MR needed?

If a user attempted to create a merge request from a shortcut with a pre-specified target branch (e.g. `master`), the dropdown would suggest that the user could change the branch. However, this did not actually work due to duplicate data elements (see #1830 for more details), and the target branch would always be set to the original, default branch. This would lead to confusion, potentially causing an improper merge request to be created.

### What are the relevant issue numbers?

Closes #1830

### Screenshot

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/eeec4f5d4b66625a14be41e5ecbdc016/image.png)

See merge request !846
2015-06-20 10:41:07 +00:00
Nicolas aecc989154 Make snippet filename optional.
Fixes #2384.
2015-06-20 01:06:57 +02:00
Stan Hu c8d4a408f8 Disable changing of target branch in new merge request page when a branch has already been specified
Closes #1830
2015-06-19 15:39:56 -07:00
Robert Speicher efa0146c7f Merge branch 'rs-blobview-js-refactor' into 'master'
Refactor and spec line highlighting Javascript

- Replaces the fragile Spinach tests for this feature with Jasmine tests
- The "Don't scroll the page when we click a line number" behavior now works as expected

See merge request !820
2015-06-19 21:27:25 +00:00
Robert Speicher 516b4c1248 Allow Admin to filter users by 2FA status 2015-06-19 16:35:53 -04:00
Robert Speicher b6318297fc Use User#two_factor_enabled instead of otp_required_for_login 2015-06-19 15:14:37 -04:00
Robert Speicher 22dd2240a6 Add 2FA status to Admin::Users#show 2015-06-19 15:04:47 -04:00
Darby 9209f43b32 Edited the CSS of header and sidebar; added a new class of logo-container to the html to make things easier 2015-06-19 09:54:26 -07:00
Dmitriy Zaporozhets 7524d7c082 Revert merge request states renaming
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 17:09:50 +02:00
Dmitriy Zaporozhets f5e0e5c0a3 Replace old logo with new one
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 16:59:16 +02:00
Dmitriy Zaporozhets d059c69db7 Move identities list to own controller action
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 15:29:53 +02:00
Dmitriy Zaporozhets 270b7ce810 Add ability for admin to edit user identity
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 15:29:53 +02:00
Dmitriy Zaporozhets 228da2dd28 Admin can see and remove user identities
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 15:29:52 +02:00
Robert Speicher da15428340 Simplify line numbering 2015-06-19 04:31:24 -04:00
Robert Speicher b3f9be0639 Refactor and spec BlobView JS 2015-06-19 04:31:23 -04:00
Darby e2e8e384bb Revert "Changed the placeholder text and modified the css class to make it visible"
This reverts commit c39c823421.
2015-06-18 13:50:33 -07:00
Robert Speicher 1c4bf0e474 Use skip_js for commit timestamps
This greatly improves frontend rendering times.
2015-06-17 16:59:51 -04:00
Robert Speicher bc027c5183 Load the Merge Request > Commits tab lazily 2015-06-17 16:59:51 -04:00
Robert Speicher 8c8cd8be43 Update time_ago_with_tooltip helper
Minor refactoring, add specs, changes arguments to use keywords.
2015-06-17 16:37:10 -04:00
Dmitriy Zaporozhets 1eb51e1706 Merge branch 'placeholder_text'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile.lock
2015-06-17 11:43:08 +02:00
Darby c39c823421 Changed the placeholder text and modified the css class to make it visible 2015-06-16 14:44:13 -07:00
Robert Speicher 0d7a0675ac Bootlint: Fix incorrectly nested form-group element 2015-06-16 13:33:48 -04:00
Robert Speicher 09b4e11d26 Bootlint: Add missing type attribute for buttons 2015-06-16 13:33:48 -04:00
Robert Speicher e3c1818a3e Bootlint: Modals no longer need a '.hide' class 2015-06-16 13:32:33 -04:00
Robert Speicher 7400cfc114 Bootlint: Use offset grid classes instead of empty divs 2015-06-16 13:32:32 -04:00
Douwe Maan adffe47d3c Merge branch 'support-comment-parallel-diff' into 'master'
Support commenting on a diff in side-by-side view

### What does this MR do?

This MR adds support for commenting on a diff in side-by-side (aka parallel) view. It also fixes a JavaScript bug (see !779) when the comment button is clicked on a line that already has a comment.

There is an existing bug where the comment count is not updated when a new comment is added. I'll send a MR for that later.

### Why was this MR needed?

Commenting only worked in "inline" mode. Often the side-by-side view is more conducive to writing comments.

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9283

### Screenshot

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/3d0a3213fde38844a681a826da18139b/image.png)

See merge request !810
2015-06-16 14:43:15 +00:00
Stan Hu a7932fe2fd Support commenting on a diff in side-by-side view
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
2015-06-16 06:11:59 -07:00
Douwe Maan 9af2bc8907 Merge branch 'header_layout_issue' into 'master'
Fix layout issue in header title truncation.

@douwe Thanks for reviewing this fix for the issue mentioned in https://dev.gitlab.org/gitlab/gitlabhq/issues/2314#note_48539.

**BEFORE**

![before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/4ffb35f77155a92c64cfe36c66987eb0/before.gif)

**AFTER**

![after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2bb2d0c4a93164f6d47e24cdcb9a106b/after.gif)

See merge request !1867
2015-06-16 12:34:21 +00:00
Douwe Maan 63969337a9 Merge branch 'applications_form' into 'master'
Fix UI issues in Applications form

@douwe Thanks for reviewing this small fix.

---

Before:

![application_form_before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/11fbee17ad6a4c9456cd7d6cba5ae429/application_form_before.png)

---

After:

![application_form_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/0c64214ccda6c77095f468fcb8c748f3/application_form_after.png)

See merge request !1859
2015-06-16 11:50:13 +00:00
Nicolas d8209aebdc Fix layout issue in header title truncation. 2015-06-16 04:16:26 +02:00
Nicolas 4cf7d8d956 Fix consistency issues on New Application page. 2015-06-15 21:27:20 +02:00
Nicolas f18a24f0ac Fix layout issue when New Application validation fails. 2015-06-15 21:27:15 +02:00
Dmitriy Zaporozhets 7a7c6b469b Fix text align in last push event
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-15 14:54:41 +02:00
Dmitriy Zaporozhets 7300729190 Merge branch 'rs-dev-issue-2228' into 'master'
Allow user to customize default Dashboard page

Renames the "Design" profile page to "Preferences" and adds a field to customize the default Dashboard page:

> ![Screen_Shot_2015-06-11_at_11.12.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5282a3be7861d1148528c6bc9e7a0e0/Screen_Shot_2015-06-11_at_11.12.53_PM.png)

See merge request !778
2015-06-15 11:29:36 +00:00
Marin Jankovski 168d5eabd4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-15 11:34:03 +02:00
Douwe Maan 646ce0aab5 Merge branch 'remove-visibility-icons' into 'master'
Remove visibility icon from projects list on dashboard and group page

## Why?

Because

* visibility level show on project page anyway
* it does not have much value. Main purpose of project list on dashboard is navigation. Avatar + project name helps this goal. Visibility icon have no effect here
* it makes UI worse because it brings separation between project avatar and name
* without visibility icon we have more space for project name. Especially important for laptops

## Screenshot

![Screenshot_2015-06-12_18.17.20](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0e572388e9a337c5a535813911d08c89/Screenshot_2015-06-12_18.17.20.png)

P.S. Merge when 7-12-stable is created

See merge request !806
2015-06-15 07:55:32 +00:00