home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,867 Commits 48 Branches 340 Tags
ce_upstream
Commit Graph
654 Commits
Author SHA1 Message Date
Valery Sizov 7c091d701b Merge branch 'master' into ce_upstream 2015-12-03 14:09:00 +02:00
Valery Sizov b871c38bf2 Fix failures in master 2015-12-03 13:21:30 +02:00
Andrew Tomaka daca985a6e Prevent impersonation if blocked 2015-12-02 08:07:29 -05:00
Valery Sizov 7b327b68e3 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-12-01 19:54:45 +02:00
Valery Sizov a9b8612818 Merge branch 'ce_upstream' into 'master' 
CE upstream



See merge request !64
 2015-11-26 08:01:23 +00:00
Stan Hu 36bde0fcb1 Fix Error 500 when viewing user's personal projects from admin page 
This is a regression introduced in 4d7f00f.

Closes #3680
 2015-11-25 14:00:35 -08:00
Douwe Maan 531f3ac462 Allow license to be uploaded as text rather than file 2015-11-24 15:55:02 +01:00
Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee 
Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb
 2015-11-19 10:33:18 -05:00
Alex Jordan 3300db70ff Rewrite HTTP links to force TLS, where possible 2015-11-16 16:50:05 -08:00
Robert Speicher 37fe73c337 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-15 00:30:17 -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
Robert Speicher 6afca45028 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-13 12:34:34 -05:00
Kamil Trzciński fb5c3c7021 Merge branch 'artifacts' into 'master' 
Implement Build Artifacts

This implements #3028 

1. It stores artifacts in shared/artifacts,
1. It adds `artifacts` to `.gitlab-ci.yml`,
1. We use GitLab Workhorse to offload artifacts uploading,
1. To download artifacts it uses GitLab Workhorse X-Sendfile extension,
1. There's one "artifact" per-build. The new upload removes previous one and creates a new one,
1. Default max artifact size is set to 100MB - this can be changed in settings.

Missing things:
1. Support for `.gitlab-ci.yml`: `artifacts: true or git-ls-files` which will upload all non tracked files,
1. Artifacts passing between builds.

GitLab Workhorse changes: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/5
GitLab Runner changes: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/46

Syntax:
```
artifacts:
  untracked: true # default: false
  paths: # default: empty
  - bin/files
```


See merge request !1584
 2015-11-11 12:44:37 +00:00
Kamil Trzcinski d0e3e823a2 Implement Build Artifacts 
- Offloads uploading to GitLab Workhorse
- Use /authorize request for fast uploading
- Added backup recipes for artifacts
- Support download acceleration using X-Sendfile
 2015-11-10 12:51:50 +01:00
Jason Lee 18cb430f79 Replace CoffeeScript block into JavaScript in Views. 
For example view: shared/issuable/_context

CoffeeScript: 190ms
JavaScript: 19.7ms
 2015-11-10 19:17:37 +08:00
Kamil Trzcinski b18671a1b2 Enable shared runners for all new projects 2015-11-05 17:02:02 +01:00
James Newton 3bb626f91c refactor login as to be impersonation with better login/logout 
Modifies the existing "login as" feature to be called impersonation, as
well as keeping track of who is impersonating to revert back to that
user without having to log out.
 2015-10-29 11:00:17 +01:00
Valery Sizov 0f30be02eb Merge remote-tracking branch 'origin/master' into ce_upstream 2015-10-23 13:01:19 +02:00
Douwe Maan d222ce8b34 Merge branch 'master' into full-width-tables 2015-10-21 08:39:19 +02:00
Douwe Maan 47194545c7 Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify 
[ci skip]
 2015-10-19 13:48:52 +02:00
Douwe Maan a32f776609 Make tables full width. 2015-10-19 11:19:45 +02:00
Douwe Maan 7ccfbcccef Add help text to admin settings notification email. 2015-10-18 11:59:07 +02:00
Douwe Maan df9062d0b5 Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify 2015-10-18 11:31:49 +02:00
Dmitriy Zaporozhets 7c85ebf6dc Partly implement new UI for user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-10-16 13:24:28 +02:00
Valery Sizov 8766c54bf2 Merge remote-tracking branch 'origin/master' into ce_upstream_15_10 2015-10-15 16:46:48 +03:00
Yorick Peterse 9496356367 Re-use User objects for avatar_icon where possible 
This removes the need for running an extra SQL query in these cases.
 2015-10-15 12:05:01 +02:00
Dmitriy Zaporozhets 4624e9e728 Merge branch 'spellcheck_false' into 'master' 
Add spellcheck=false to certain input fields

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

See merge request !1559
 2015-10-12 14:29:29 +00:00
Valery Sizov d805c5dbb3 Add spellcheck=false to certain input fields 2015-10-12 12:54:54 +03:00
Jerry LukinsandJerry Lukins 78de79d779 Persist filters when sorting on user admin page 2015-10-10 09:04:45 -04:00
Jonathan Rochkind ae4fbae26c Send an email (to support) when a user is reported for spam 2015-10-08 17:33:57 -04:00
Robert Speicher fc59c45d58 Remove the option to disable CI 
This option only existed to ease the CI-to-CE/EE migration process.

This commit partially reverts 8b05abe816
 2015-10-05 12:23:38 -04:00
Diogo Resende bbb845b20b Adds newline at end of file 2015-09-30 17:28:06 +00:00
Diogo Resende 63a6259328 Adds missing plural form of applications of previous commit 2015-09-30 17:26:55 +00:00
Diogo Resende e471356f76 Fixes english information paragraph in admin/applications view 2015-09-30 08:34:00 +00:00
Douwe Maan 1c1c7e1abd Merge branch 'fxposter/gitlab-ce-login-from-admin' 2015-09-28 15:43:02 +02:00
Aaron Snyder a9cfa6c508 Fix grammar in admin area labels .nothing-here-block when no labels exist. 
updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
 2015-09-26 11:25:26 -07:00
Pavel Forkert 82eeb5e284 Remove stuff from previous UI 2015-09-24 16:38:52 +03:00
Pavel Forkert eb9528b8b9 Move login button to user page, switched to POST method 2015-09-24 16:34:04 +03:00
Pavel Forkert 83347954fc Add option to admin area to sign in as a specific user 
Closes #2291
 2015-09-24 16:14:16 +03:00
Dmitriy Zaporozhets 80a983b492 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-22 12:25:41 +02:00
Hannes Rosenögger 3a4c5986fb clarify confirmation text on user deletion. 2015-09-21 22:05:13 +02:00
Douwe Maan 0c83349867 Merge branch 'master' into rename-reply-by-email 2015-09-21 10:35:56 +02:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02:00
Kamil Trzcinski b2a9021685 Change wording 2015-09-21 00:42:25 +02:00
Kamil Trzcinski e41a29b0c3 Allow to disable GitLab CI 2015-09-18 12:46:47 +02:00
Jeroen van Baarsen fe17a236e3 Allow custom info to be added to Help page 
Fixes #2536

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-09-18 10:15:40 +02:00
Dmitriy Zaporozhets 1ba393de81 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-09-16 10:26:10 +02:00
Valery Sizov 57d0013090 CRUD for admin labels 2015-09-03 15:50:23 +03:00
Dmitriy Zaporozhets ef0149dd44 Merge branch 'enable_ssl_verification_web_hook' into 'master' 
Enable SSL verification for Webhooks

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

See merge request !1135
 2015-08-26 16:06:02 +00:00
Dmitriy Zaporozhets 243bf65124 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-26 17:15:12 +02:00