home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
4837 Commits
Author SHA1 Message Date
Stan Hu e2190115e8 Merge branch 'graphs-branch-switching' into 'master' 
Add ref switching support for graphs

It is now possible to view contributor and commit statistics for
refs beyond the default branch. While the Git ref already was part of
the path it has not been used before.

Additionally, the code in RefsController#switch has been slighliy
refactored since it would have become confusing with additional if-else
branches added.

See merge request !932
 2015-07-06 15:12:24 +00:00
Daniel Gerhardt 2963e7fd1c Add ref switching support for graphs 
It is now possible to view contributor and commit statistics for
refs beyond the default branch.

Additionally, conditions in RefsController#switch have been refactored
in order that a `case` block is used now.
 2015-07-06 16:44:30 +02:00
Valery Sizov 111ebe5471 Fork visibility level fix 2015-07-06 17:40:33 +03:00
Dmitriy Zaporozhets 99c3b112fa Merge branch 'disable-sticky-diffs' into 'master' 
Disable sticky diffs

Revert feature introduced in https://github.com/gitlabhq/gitlabhq/pull/8760

Why?

* It has unfixed bug for long time which is really annoying - https://github.com/gitlabhq/gitlabhq/pull/8760
* I was not able to properly fix it
* It affected performance in bad way

See merge request !935
 2015-07-06 13:23:32 +00:00
Dmitriy Zaporozhets f3590c83ea Merge branch 'audit_log' into 'master' 
Audit log for user authentication

https://dev.gitlab.org/gitlab/gitlabhq/issues/2318

See merge request !931
 2015-07-06 10:09:53 +00:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00
Dmitriy Zaporozhets 9860ab0f22 Remove sticky-diff functionality 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-06 11:34:37 +02:00
Dmitriy Zaporozhets 7081ab1e9e Merge branch 'add-unlock-access' into 'master' 
Add support for unlocking users in admin settings

### What does this MR do?

This MR gives the ability to unlock a user from the Admin panel.

### Why was this MR needed?

If a user fails to login a certain number of times, Devise locks the user out for a certain amount of time (e.g. 10 minutes). There is no way for an admin to unlock a user if this happens (aside from editing the `locked_at` field entirely).

### Screenshots

#### Admin index page

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14c661d1d1f026770997b19af714c514/image.png)

#### Admin edit user page

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0c6f795757e5f03eeb923d818b7d6a96/image.png)

### What are the relevant issue numbers?

This replaces !288.

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

See merge request !922
 2015-07-02 13:39:35 +00:00
Stan Hu 3e738e3b9a Add support for unlocking users in admin settings 
Closes https://github.com/gitlabhq/gitlabhq/issues/9381
 2015-07-02 04:22:51 -07:00
Dmitriy Zaporozhets 7c42aaa576 Merge branch 'anonymous-applications' into 'master' 
Correctly show anonymous authorized applications under Profile > Applications.

Fixes #1907.

Access tokens that were created using the ["Resource Owner Password Credentials" flow](http://doc.gitlab.com/ce/api/oauth2.html#resource-owner-password-credentials) by the user entering their username and password don't have a connected application, so the Profile > Applications page used to crash. These tokens are now rendered as "Anonymous" and can be revoked.

![Screen_Shot_2015-07-02_at_11.53.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0fb044ce1fbf5d5e2825c3abee7763ee/Screen_Shot_2015-07-02_at_11.53.55.png)

See merge request !924
 2015-07-02 10:55:29 +00:00
Douwe Maan cd5e79e98b Correctly show anonymous authorized applications under Profile > Applications. 2015-07-02 11:53:31 +02:00
Stan Hu b643fa1603 Remove link leading to a 404 error in Deploy Keys page 
Closes #1866
 2015-07-01 22:53:52 -07:00
Darby c611b6f623 Comment box/Placeholder text redo 2015-07-01 15:49:31 -07:00
Dmitriy Zaporozhets f31d2aa44d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-01 11:41:26 +02:00
Dmitriy Zaporozhets 98049a3e0c Merge branch 'ui-improvements' into 'master' 
UX improvements

* make atom feed on commits page smaller so it capture less attention
* open big image 400px instead of default 40px when click on user avatar

See merge request !910
 2015-07-01 09:40:44 +00:00
Douwe Maan 690aafebdb Merge branch 'group_settings_nav' into 'master' 
Fix consistency issue in sidebars of Project and Group Settings.

Fixes #2277

![before_after_group_settings_nav](https://dev.gitlab.org/gitlab/gitlabhq/uploads/370c701d0eff8f1f8e44cf954c75f2bf/before_after_group_settings_nav.png)

See merge request !1871
 2015-07-01 09:32:41 +00:00
Dmitriy Zaporozhets d75f16c2ec Fix commits feed button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-01 11:19:07 +02:00
Dmitriy Zaporozhets 70666a52b4 Use to_reference menthod when render issue id in list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-01 09:46:37 +02:00
Dmitriy Zaporozhets 4d80360bed Cache markdown of comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-30 15:54:20 +02:00
Dmitriy Zaporozhets 40e31e1db3 Cache issue in the list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-30 15:48:19 +02:00
Dmitriy Zaporozhets 496f94de4a Cache commits list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-30 15:41:25 +02:00
Dmitriy Zaporozhets b76659c537 Re-use event cache with other users unless its personal 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-30 15:34:16 +02:00
Dmitriy Zaporozhets f9261e6596 Open big avatar when click on user image 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-30 15:23:32 +02:00
Dmitriy Zaporozhets b42c40bff3 Make commits atom feed button smaller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-30 15:13:18 +02:00
Robert Speicher ae75b2ee40 Remove requires-input from the Network Graph form 
The "Begin with the selected commit" checkbox requires the submit button
to be enabled, even if the extended SHA1 input field is blank.
 2015-06-26 22:49:32 -04:00
Robert Speicher 8384b577ef Remove duplicate 'required: true' attribute 2015-06-26 22:08:34 -04:00
Robert Speicher f6503f71f9 Remove disableButtonIf[Any]EmptyField calls from forms 
These have been replaced by the "requiresInput" behavior.
 2015-06-26 22:07:59 -04: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 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 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
Darby e94e23617a Removed the icons from the New Issue and New Project buttons 2015-06-24 11:48:04 -07:00
Nicolas a521e88fc0 Fix consistency issue in sidebars of Project and Group Settings. 
Fixes #2277.
 2015-06-24 18:05:16 +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 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
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
Darby 4cd3c33024 Updated the categories of Application Settings Form 2015-06-23 14:39:04 -07:00
Valery Sizov af93d447b6 Explicit error when commit not found in the GitLab CI 2015-06-23 14:50:06 +03:00
Dmitriy Zaporozhets 8c6cbd4306 Merge branch 'master' into admin-edit-identities 2015-06-23 12:09:45 +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