home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 05:06:46 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,335 Commits 48 Branches 340 Tags
d63371ad783db055da840be37ddac0cdcb49db2c
Commit Graph
17335 Commits
This Branch
This Branch
All Branches
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 304386aa02 Write test for submitting issue as guest 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:38:14 +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 6006065e06 Update CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:18:32 +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
Dmitriy Zaporozhets 28830c0d5b Merge branch 'sidebar-animation' into 'master' 
Have sidebar labels disappear behind content instead of hide immediately when collapsing.

I'm not sure how to make a gif out of it, but I promise it looks pretty :)

See merge request !888
 2015-06-25 11:33:27 +00:00
Dmitriy Zaporozhets 482b9605a3 Merge branch 'highlight-link-sidebar' into 'master' 
prettier highlighting of active link in the sidebar

Before:

![Screenshot_2015-06-25_11.17.08](https://dev.gitlab.org/gitlab/gitlabhq/uploads/851606a122c1d1174d0f97857ad472d3/Screenshot_2015-06-25_11.17.08.png)

After:

![Screenshot_2015-06-25_11.17.42](https://dev.gitlab.org/gitlab/gitlabhq/uploads/b8dc55bcd76dac29652ef5d25f99ccff/Screenshot_2015-06-25_11.17.42.png)

Only with this theme it's not an improvement (this is an honest merge request (trademark pending)) :

![Screenshot_2015-06-25_11.18.35](https://dev.gitlab.org/gitlab/gitlabhq/uploads/5d631a11ee866f5fc51e985b02a836ba/Screenshot_2015-06-25_11.18.35.png)

See merge request !1879
 2015-06-25 11:32:27 +00: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 3f5a3f73f5 Merge branch 'rs-default-admin-password' into 'master' 
Change the default admin password

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

See merge request !865
 2015-06-25 08:35:07 +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
Robert Speicher 9f939cdd6d Add CHANGELOG entry for default password change 2015-06-24 18:42:35 -04:00
Robert Speicher 8a01a12228 Change default admin password from "5iveL!fe" to "password" 2015-06-24 18:42:34 -04:00
Robert Speicher d2de219f6c Merge branch 'add-2fa-status-to-admin-api' into 'master' 
Add 2FA status to user admin API

This MR adds the `two_factor_enabled` field to the admin's API to indicate whether a given user has enabled 2FA.

See merge request !881
 2015-06-24 19:24:20 +00:00
Darby e94e23617a Removed the icons from the New Issue and New Project buttons 2015-06-24 11:48:04 -07:00
Stan Hu c465af0930 Merge branch 'master' into 'master' 
Updated merge request merged web hook to correctly fire action=merged.

I believe this merge request will fix both issues #879 and #498.

If a merge request was merged via the command line, the correct web hook was fired with the field `object_attributes.action = "merge"`. However, if the merge request was merged via the web UI, the webhook would be fired with `object_attributes.action = "open"`.

See merge request !780
 2015-06-24 14:19:49 +00:00
Adam Meily 8b94ca655d Merge branch 'master' of gitlab.com:ameily/gitlab-ce into HEAD 2015-06-24 10:17:30 -04:00
Adam Meily aaa42e936e Added CHANGELOG message for fixing MR webhook 2015-06-24 10:17:03 -04: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 82f372c719 Add CHANGELOG item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-24 12:59:35 +02:00
Dmitriy Zaporozhets 81952b619b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-24 12:58:14 +02: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 b8af2ecc16 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce 2015-06-24 10:51:43 +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
Dmitriy Zaporozhets 21e402e7ca Merge branch 'rs-dev-issue-2419' into 'master' 
Allow user to remove public email address

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

See merge request !880
 2015-06-24 08:30:44 +00:00
Stan Hu 6548e9b48c Add 2FA status to user admin API 
Closes https://github.com/gitlabhq/gitlabhq/issues/9391
 2015-06-23 22:41:59 -07: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