home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
20,461 Commits 48 Branches 340 Tags
8a03cb87442a42c8fc1630ab356dfd35dbb476f7
Commit Graph
20461 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitriy Zaporozhets b736a7b15e Merge branch 'lfs' into 'master' 
Git LFS  support

Part of gitlab-org/gitlab-ce#2955

See merge request !1727
 2015-11-16 13:01:19 +00: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 cd513034e6 Set less strict flay option for now 
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
Valery Sizov 9179fcece8 Merge branch 'test_env_cache' into 'master' 
Disabling cache for test environment



See merge request !1807
 2015-11-16 11:35:05 +00:00
Valery Sizov 9e0d443f9e Disabling cache for test environment 2015-11-16 12:18:31 +02: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
Dmitriy Zaporozhets 86ce64f053 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-11-16 10:18:40 +01:00
Dmitriy Zaporozhets a43a218c98 Merge branch 'releases-feature' 2015-11-16 10:18:32 +01:00
Dmitriy Zaporozhets 743d66e4da Improve english text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-16 10:11:16 +01:00
Valery Sizov 5be2191b1a Merge branch 'rs-revert-gh-9812' into 'master' 
Revert "Merge pull request #9812 from chrspeich/hide-tabs-lone-auth-provider"

This reverts commit 84999611d8, reversing
changes made to 0d9fb211f3.

See merge request !1805
 2015-11-16 07:56:56 +00: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
Robert Speicher 3777b233a3 Merge branch 'relative_links_default_branch' into 'master' 
Relative links in project README should point to default branch, not master

Relative links in the README shown on a project's main page currently always point to the "master" branch.  This is a particularly obvious problem for projects that have no "master" branch, since the link points to a non-existent file.

This patch changes the relative links to instead point to the default branch.

Resolves #2707, #1134, #1852

See merge request !1801
 2015-11-15 18:25:20 +00:00
Alec Cooper 4bb99677b1 Relative links in the README file shown on the repository homepage should point 
to the default branch, not to master
 2015-11-14 15:00:55 -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
Kamil Trzcinski fea2f21437 Fix caching breaking test of build artifacts 2015-11-13 14:43:14 +01: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 Trzciński b9fedcb7b9 Merge branch 'gitlab-workhorse' into 'master' 
Bump Gitlab Workhorse



See merge request !1795
 2015-11-13 10:22:38 +00:00
Kamil Trzcinski f36698663c Bump the GITLAB_WORKHORSE version to 0.4.1 [ci skip] 2015-11-13 11:18:15 +01: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
Dmitriy Zaporozhets 3c16fb93fc Move spec to proper place and fix unused variable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 09:45:21 +01:00
Stan Hu b72cbd8d7d Merge pull request #9757 from yms9654/diff-option 
Add ignore white space option in merge request diff
 2015-11-13 00:43:38 -08: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
Achilleas Pipinellis 8146509c0b Merge branch 'omniauth-doc-fix' into 'master' 
Add missing "omniauth" prefix to option in docs

This MR is specifically a fix for #3319. I wanted to make my first contribution to GitLab, so I picked a simple one!

This changes the omniauth documentation for the `block_auto_created_users` option to `omniauth_block_auto_created_users`.

Thanks

---

closes #3319 

See merge request !1734
 2015-11-13 06:24:07 +00:00
Dmitriy Zaporozhets c613f2d9a8 Don't allow flog failure any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 01:08:10 +01:00
Dmitriy Zaporozhets c71892e1a8 Even more refactoring to inline_diff.rb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 01:07:33 +01:00
Dmitriy Zaporozhets c903f23f3c Split complex methods in GoogleCodeImport::Importer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 00:55:20 +01:00
Dmitriy Zaporozhets ea6a78ef5c Split complex Gitlab::InlineDiff::processing method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-13 00:44:16 +01: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 d6db451732 Add api test for creating tag with release info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-12 23:54:22 +01:00
Dmitriy Zaporozhets 8f53094f0f Add API docs and correctly expose release api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-12 23:52:02 +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 ba34045f31 Expose release notes to tags api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-12 17:04:18 +01:00