home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,489 Commits 48 Branches 340 Tags
9b0efdb71ea6e4f3a33db9959c63125cd50afebe
Commit Graph
10163 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9b0efdb71e Remove code duplication in notification_service.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 12:05:35 +01:00
Dmitriy Zaporozhets 616675b4a6 Remove duplication in mailers/emails/notes.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 11:55:43 +01:00
Dmitriy Zaporozhets 3cebe9e780 Refactor duplciate code for groups_controller.rb and slack_service/note_message.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 11:03:18 +01:00
Dmitriy Zaporozhets 437d4c76ec Remove duplication in diff_helper.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 10:49:23 +01:00
Dmitriy Zaporozhets 5f23909362 Remove code duplication in gitlab_markdown_helper.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-17 10:40:29 +01:00
Dmitriy Zaporozhets bfbfa3b5f0 Remove duplication in issue emails 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 23:56:16 +01:00
Dmitriy Zaporozhets adec8c7768 Refactor select2 tags 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 23:56:16 +01:00
Dmitriy Zaporozhets 0061143ccd Merge branch 'global-milestones' into 'master' 
Create milestones in the group

When you work with groups its quite often you want to create same milestone in multiple projects. This MR allows you to do so

For #3488 

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

See merge request !1797
 2015-11-16 20:41:27 +00:00
Dmitriy Zaporozhets b093f50986 Some code and doc improvements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 19:55:58 +01:00
Dmitriy Zaporozhets 32f1a71968 Fix removing avatar for group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 17:24:14 +01:00
Dmitriy Zaporozhets 929ab909c8 Group masters should be able to create/close milestones 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 16:14:19 +01:00
Dmitriy Zaporozhets 9a3df9d5d0 Merge branch 'ci-runners-master-or-owner' into 'master' 
Show specific runners from projects where user is master or owner

This fix for permission escalation when handling specific runners.

The users were allowed to assign runners from projects where they were guests.


See merge request !1809
 2015-11-16 15:00:55 +00:00
Dmitriy Zaporozhets f16f315115 Few changes to Group Milestone feature: 
* Group attachments are not supported so I removed attach file link
* Added changelog item
* Add markdown hint to project milestone form

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 15:07:16 +01:00
Dmitriy Zaporozhets 8630d476e4 Add header and page title to new milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:45:20 +01:00
Dmitriy Zaporozhets 8a03cb8744 Lets add more tests to Milestones services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:39:19 +01:00
Dmitriy Zaporozhets 98d6d491b5 Move global milestone specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:38:34 +01:00
Dmitriy Zaporozhets c79d801bf5 Fix a bug when milestone/label filter was empty for dashboard issues page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:07:38 +01:00
Dmitriy Zaporozhets 986695e136 Refactor global and group milestones logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:07:38 +01:00
Dmitriy Zaporozhets 05335a3c85 Create milestones in the group 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 14:07:38 +01:00
Dmitriy Zaporozhets 1328e4b504 Merge branch 'refactor-duplication' into 'master' 
Remove some code duplication

* remove duplicate code in uploaders
* remove duplicate code in NotificationHelper
* remove duplicate code in Repository


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

See merge request !1800
 2015-11-16 13:05:49 +00:00
Kamil Trzcinski 03f5ff750b Show specific runners from projects where user is master or owner 2015-11-16 13:24:56 +01:00
Dmitriy Zaporozhets c9f2f2a483 Fix wrong variable name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 0698c96d7d Remove duplicate code in Repository#*_names_contains 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 433e4a80ef Fix code duplication in NotificationsHelper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 13:01:34 +01:00
Dmitriy Zaporozhets 796bb65170 Remove duplicate methods in uploaders 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 13:01:34 +01:00
Marin Jankovski 14032d8eb1 Add support for git lfs. 2015-11-16 12:39:13 +01:00
Dmitriy Zaporozhets 6c8dded20b Merge branch 'fix_trailing_title_space' of https://gitlab.com/dblessing/gitlab-ce 2015-11-16 10:40:49 +01:00
Robert Speicher 9337da7864 Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider" 
This reverts commit 84999611d8, reversing
changes made to 0d9fb211f3.
 2015-11-15 21:37:13 -05:00
Dmitriy Zaporozhets aec9f211e5 Merge branch 'impersonate' into 'master' 
refactor login as to be impersonation with better login/logout

Modifies the existing "login as" feature to be called impersonation.

This also adds:

* Application keep track of who is impersonating the user so they can revert back to the original user without having to log out.
* Stores the user profile via `HTTP_REFERER` so you get redirected back to the person you have impersonated once you stop.

## Screenshots:

![](http://sindacio.us/i/2015-10-28_17-52-41.png)
![](http://sindacio.us/i/2015-10-28_17-53-08.png)

See merge request !1702
 2015-11-14 09:04:10 +00:00
Dmitriy Zaporozhets da8ca8b217 Merge branch 'annotate-models' into 'master' 
Annotate models

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

See merge request !1799
 2015-11-14 08:27:12 +00:00
Dmitriy Zaporozhets a237999f00 Annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 19:22:46 +01:00
Kamil Trzciński eaf27c6295 Merge branch 'builds_feature' into 'master' 
Expose builds feature

Expose builds feature in project settings (as feature).

Enable it by default for a new projects.

I deliberately named it builds instead of CI, because we actualy allow to run tests using infrastructure built-in GitLab. I'm free to change it.

![Screen_Shot_2015-11-09_at_16.42.21](/uploads/a8af0a56fc0498688c0428ff22252d9c/Screen_Shot_2015-11-09_at_16.42.21.png)

If we are ok, I'll add feature tests for it.

/cc @sytses @dzaporozhets 




See merge request !1767
 2015-11-13 17:55:16 +00:00
Dmitriy Zaporozhets f197b528ff Merge branch 'refactor-complex-methods' into 'master' 
Refactor complex methods

Make flog part of CI check which is not allowed to fail. I used high score (70) and refactored most complex method. In future releases we should lower acceptable score to something like 40..50

Part of #3444 

See merge request !1794
 2015-11-13 11:48:40 +00:00
Kamil Trzcinski e53a56acea Fix broken tests 2015-11-13 10:52:50 +01:00
Kamil Trzcinski 6384c757b7 Expose CI enable option in project features 
- Enable CI by default for all new projects
 2015-11-13 10:52:50 +01:00
Dmitriy Zaporozhets 37465f44b4 Merge pull request #9825 from huacnlee/cache-application-setting 
Add caching for ApplicationSetting, Ci::ApplicationSetting.
 2015-11-13 10:15:52 +01:00
Minsik Yoonand윤민식 3d0efa8e0a Add ignore white space option in merge request diff 
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393).

Add ignore whitespace optoin to Commits Compare view
 2015-11-13 16:53:53 +09:00
Dmitriy Zaporozhets bcc8251196 Split complex method EventsHelper#event_feed_url. 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 00:15:33 +01:00
Dmitriy Zaporozhets 857710634c Split complex method Issues::UpdateService#execute 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 00:13:45 +01:00
Dmitriy Zaporozhets 7f0b4ce16f Split complex method SystemHooksService#build_event_data 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 00:12:18 +01:00
Dmitriy Zaporozhets e5cc197a99 Split huge method MergeRequests::UpdateService#execute 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 00:06:42 +01:00
Dmitriy Zaporozhets 23ed732e39 Merge branch 'use-path-for-new-issue-button' into 'master' 
Use a relative link instead of full URL with New Issue button to be consistent

Relates to #3095

See merge request !1631
 2015-11-12 22:20:35 +00:00
Dmitriy Zaporozhets 329a5555e5 Merge branch 'fix-avatar-not-showing' of https://gitlab.com/stanhu/gitlab-ce 2015-11-12 13:25:22 +01:00
Dmitriy Zaporozhets 63144cd062 Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list 
Avoid render edit_form in each notes.
 2015-11-12 11:55:55 +01:00
Kamil Trzciński 8ab5df9d87 Merge branch 'ci-deprecate-dumped-yaml' into 'master' 
Remove deprecated dumped yaml file generated from previous job definitions



See merge request !1777
 2015-11-12 09:42:32 +00:00
Kamil Trzciński 7ec7970b14 Merge branch 'fix_project_build_links' into 'master' 
Fix "Other Builds" links in Projects Build page

Found a minor issue where all links in the "Other Builds" section of Project Builds was linking to the same build #. This should fix it.

See merge request !1785
 2015-11-12 09:41:54 +00:00
Jason Lee 2e4a673cbc Add caching for ApplicationSetting, Ci::ApplicationSetting. 
ApplicationSetting.current was called in every pages, cache it and expires it after it updated.

This changes will avoid a SQL query in every pages (~0.3 - 0.5ms).

```SQL
SELECT  "application_settings".* FROM "application_settings"   ORDER BY "application_settings"."id" DESC LIMIT 1
```
 2015-11-12 17:19:03 +08:00
Jason Lee 1974087114 Avoid render edit_form in each notes. 
Use RJS to render edit note feature.

Before:

```
Rendered projects/notes/_note.html.haml (27.9ms)
Rendered projects/_zen.html.haml (0.3ms)
Rendered projects/notes/_hints.html.haml (0.7ms)
Rendered projects/_md_preview.html.haml (3.9ms)
Rendered projects/notes/_edit_form.html.haml (6.9ms)
Rendered projects/notes/_note.html.haml (17.7ms)
Rendered projects/_zen.html.haml (0.3ms)
Rendered projects/notes/_hints.html.haml (0.6ms)
Rendered projects/_md_preview.html.haml (3.4ms)
Rendered projects/notes/_edit_form.html.haml (7.0ms)
```

After:

```
Rendered projects/notes/_note.html.haml (13.8ms)
Rendered projects/notes/_note.html.haml (7.1ms)
Rendered projects/notes/_note.html.haml (9.5ms)
Rendered projects/notes/_note.html.haml (8.5ms)
```

This change reduce at least 6ms * N ('N' - number of notes).
 2015-11-12 13:16:35 +08:00
Robert Speicher 0667f050f3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-11-11 11:04:03 -05:00
Yorick Peterse 7eb502c036 Change "recent" scopes to sort by "id" 
These scopes can just sort by the "id" column in descending order to
achieve the same result. An added benefit is being able to perform a
backwards index scan (depending on the rest of the final query) instead
of having to actually sort data.
 2015-11-11 15:17:12 +01:00