home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 01:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Speicher 47b4b91ecd Reorder monthly release tasks for RC1 day 
It didn't make sense to merge CE master into EE master, and *then* do
the RC1 tasks (e.g., install/update docs) because then the RC1 won't
have the updated docs.
 2015-11-13 13:12:04 -05:00
Robert Speicher a060a8dad5 Update doc/update/8.1-to-8.2.md 
[ci skip]
 2015-11-13 13:12:04 -05:00
Robert Speicher b8ab012544 Update doc/install/installation.md for gitlab-workhorse 
[ci skip]
 2015-11-13 13:12:04 -05:00
Robert Speicher 2c13723150 Update doc/install/installation.md for 8-2-stable 
[ci skip]
 2015-11-13 13:12:04 -05: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
Dmitriy Zaporozhets c119a73793 Add releases api 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-12 16:26:39 +01:00
Dmitriy Zaporozhets d343d9d8c2 Add grape routing print 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-12 16:26:23 +01:00
Jeff Stubler 64ca9cf3e4 Merge branch 'master' into diverging-branch-graphs 2015-11-12 09:05:29 -06:00
Dmitriy Zaporozhets a5ab56fd91 Move git tags API to separate file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-12 15:41:13 +01:00
Dmitriy Zaporozhets 2ac1193720 Add release notes documentation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-12 15:22:59 +01:00
Dmitriy Zaporozhets 3c96ea766a Fix changelog item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-11-12 15:22:59 +01:00
James Lopez 56ea71a3b1 fixing rubocop - random code not related to the changes 2015-11-12 12:29:01 +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
Jon Cairns 1c89db5e39 Merge remote-tracking branch 'gitlab/master' into omniauth-doc-fix 2015-11-12 12:06:19 +00:00
Jon Cairns e073b09f1f Add missing "omniauth" prefix to option in docs [ci skip] 
Changes block_auto_created_users to omniauth_block_auto_created_users,
otherwise the option is ignored. Fixes #3319.
 2015-11-12 11:51:53 +00: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
Kamil Trzciński 9573cf6cc7 Merge branch 'caches' into 'master' 
Allow to define cache in `.gitlab-ci.yml`

This extends `.gitlab-ci.yml` syntax to allow specifying caching files and directories between builds, making it easy to preserve ex. gems.

```
cache:
  paths:
  - .bundle
  - vendor/

before_script:
- bundle install --path vendor/

rspec:
  script:
  - bundle exec rspec
```

This is based on Build Artifacts changes.

/cc@dzaporozhets 

See merge request !1786
 2015-11-12 09:39:56 +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
James Lopez e11bfa6b86 fixing rubocop indents 2015-11-12 08:44:00 +00:00
James Lopez 77dd561796 fixing rubocop indents 2015-11-12 08:43:30 +00: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
Jeff Stubler e0c64fac68 Refactor for style issues 2015-11-11 16:29:29 -06:00