home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,899 Commits 48 Branches 340 Tags
ee3a0ed6dddd906fa7deaa3cdfd91531c899298e
Commit Graph
1305 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9bf7bd27fa Merge branch 'kalibyrn/gitlab-ee-downcase-emails-for-hook' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-18 15:38:02 +02:00
Dmitriy Zaporozhets 00b9c9e934 Merge branch 'improve-hook-messages' into 'master' 
Include more information in hook error messages

When pushing commits to the remote, if a pre-receive hook gets triggered that prevents the push, it may not be clear which commit is causing the issue. Having the values of what caused the comparison to fail in the error message will help debugging, whether it be the user or the administrator.

See merge request !14
 2015-08-18 13:33:37 +00:00
Dmitriy Zaporozhets 680b087764 Merge master from CE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-17 14:01:32 +02:00
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00
Robert Speicher fb6f8d9198 Merge branch 'rs-reference-data-attrs' into 'master' 
Add `data-[type]-id` attribute to reference links

This is to let us redact them later in another filter.

See merge request !1110
 2015-08-10 00:07:56 +00:00
Robert Speicher 32e63ba7a1 Add data-[type]-id attribute to reference links 
This is to let us redact them later in another filter.
 2015-08-08 16:43:29 -04:00
Stan Hu d7accda1ae Show incompatible projects in Bitbucket import status 
See #1871
 2015-08-07 07:07:08 -07:00
Douwe Maan 0228bdc59e Merge branch 'master' into fix-ghe-import 2015-08-07 15:47:53 +02:00
Douwe Maan 5472ded240 Fix importing projects from GitHub Enterprise Edition. 2015-08-07 15:44:53 +02:00
Dmitriy Zaporozhets b48b07044b Merge branch 'master' into drop-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-04 16:42:36 +02:00
Valery Sizov 91f733c52b Merge branch 'auto_suggestion' into 'master' 
Automatic approver suggestions



See merge request !466
 2015-08-03 08:45:10 +00:00
Valery Sizov 37ae86231d Refactoring 2015-08-03 10:54:30 +03:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Valery Sizov 858737a1db auto suggestion 2015-07-31 12:25:17 +03:00
Robert Speicher 4e22dcb6a3 Add spec to RelativeLinkFilter for Unicode filenames 2015-07-30 17:25:07 -04:00
Robert Speicher 6d6f807b75 Merge branch 'fix-image-file-is-not-displayed' into 'master' 
Update RelativeLinkFilter to support non-ASCII filenames

See merge request !1050
 2015-07-30 21:24:13 +00:00
Valery Sizov 8bda433734 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-07-29 12:19:59 +03:00
GitLab 16dcf356b5 Fix style points 
To make Rubocop and Douwe happy
 2015-07-28 18:04:57 +02:00
Douwe Maan 4461cded15 Don't send "Added to group" notifications when group is LDAP synched 2015-07-28 16:08:24 +02:00
GitLab 6912f21e5c Send GL_ID to gitlab-git-http-server as JSON 2015-07-28 15:55:53 +02:00
Douwe Maan 42ebd902de Fix bug causing Bitbucket importer to crash when OAuth application had been removed. 2015-07-28 15:33:16 +02:00
GitLab ae9e5eea3c Handle missing @user during Git HTTP requests 2015-07-28 15:17:06 +02:00
Jacob Vosmaer d3305df7aa Experimental support for gitlab-git-http-server 
https://gitlab.com/gitlab-org/gitlab-git-http-server

This change introduces the GITLAB_GRACK_AUTH_ONLY environment
variable. When set, Grack requests to GitLab will only respond with
the user's GL_ID (if the request is OK) or an error. This allows
gitlab-git-http-server to use the main GitLab application as an
authentication and authorization backend.

If we like how this works we should drop the GITLAB_GRACK_AUTH_ONLY
variable at some point in the future.
 2015-07-28 14:33:19 +02:00
Hiroyuki Sato 1cd2860065 Fix the image file that contains non-ascii character is not displayed 2015-07-27 16:18:12 +09:00
Douwe Maan 70a3c165a9 Allow custom label to be set for authentication providers. 2015-07-23 15:20:12 +02:00
Douwe Maan f032b15dcf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	README.md
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	doc/workflow/README.md
#	lib/gitlab/satellite/merge_action.rb
 2015-07-23 13:40:31 +02:00
Douwe Maan 276ca427ea Fix Remove source-branch for MRs from same project 2015-07-22 14:07:41 +02:00
Sven Strickroth 5eeab9f0a6 GoogleCode importer: Do not care about casing of image file extensions 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2015-07-20 00:53:43 +02:00
Duff, Robert W 5cabec8f8f Include more information in hook error messages 
When pushing commits to the remote, if a pre-receive hook gets triggered that prevents the push, it may not be clear which commit is causing the issue. Having the values of what caused the comparison to fail in the error message will help debugging, whether it be the user or the administrator.
 2015-07-16 14:01:03 -04:00
Duff, Robert W c4afa10c1b Commit email and LDAP email don't match with hooks 
When using LDAP groups, emails are downcased. The commit email also needs to be downcased during comparisons, otherwise the pre-receive hook will cause a failure if the user hasn't chosen to downcase his own Git user.email entry.
 2015-07-16 13:55:12 -04:00
Dmitriy Zaporozhets a87989fb7d Remove satellites 2015-07-15 15:45:57 +02:00
Dmitriy Zaporozhets c84b14d2a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature
 2015-07-14 15:40:46 +02:00
Dmitriy Zaporozhets bda04bc687 Merge branch 'fork_visibility_level' into 'master' 
Forks should not have more permissive visibility levels than the original

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

See merge request !936
 2015-07-10 12:05:54 +00:00
Dmitriy Zaporozhets 1bf3e1578a Properly render plain readme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 11:36:09 +02:00
Valery Sizov 111ebe5471 Fork visibility level fix 2015-07-06 17:40:33 +03:00
Dmitriy Zaporozhets cd1e5d5666 Merge branch 'ce-to-ee' into 'master' 
CE to EE



See merge request !436
 2015-07-03 11:06:26 +00:00
Dmitriy Zaporozhets 00bf9fe33f Merge branch 'git-hooks-initial-push' into 'master' 
Fix git hook validation on initial push to master branch.

Addresses #305.

See merge request !434
 2015-07-03 10:14:33 +00:00
Dmitriy Zaporozhets dd32818441 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/assets/javascripts/project_new.js.coffee
	app/helpers/appearances_helper.rb
	app/helpers/application_helper.rb
	app/helpers/groups_helper.rb
	app/helpers/oauth_helper.rb
	app/models/user.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/layouts/nav/_group.html.haml
	app/views/layouts/nav/_project_settings.html.haml
	app/views/profiles/accounts/show.html.haml
	doc/integration/README.md
	features/steps/project/merge_requests.rb
	features/support/env.rb
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/oauth_helper_spec.rb
	spec/lib/gitlab/ldap/access_spec.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/project_team_spec.rb
	spec/routing/admin_routing_spec.rb
	spec/services/git_push_service_spec.rb
	spec/services/test_hook_service_spec.rb
 2015-07-02 17:07:02 +02:00
Douwe Maan 246fe9270a Fix reference extractor when there is no project. 2015-07-02 14:11:45 +02:00
Douwe Maan 52574ba721 Fix git hook validation on initial push to master branch. 2015-07-02 13:58:27 +02:00
Kamil Trzcinski a34c61d9c6 Reuse HTML Pipeline object in Markdown parser 
The patches reduces pressure on GC and reduces markdown processing time
 2015-06-30 13:59:27 +02:00
Hiroyuki Sato 4a203aab57 Fix wrong order of issues when importing from github 
See API details at https://developer.github.com/v3/issues/.
Refs #1791
 2015-06-28 04:02:21 +09: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 541f7675f9 Merge branch 'fix-diff-patch-public-mr' into 'master' 
Fix downloading of patches on public merge requests when user logged out

### What does this MR do?

This MR makes it possible to download a diff patch on a public merge request when a user is logged out.

### Why was this MR needed?

An Error 500 would result when a user attempted to click on the "Email Patches" or "Plain Diff" button:

```
NoMethodError - undefined method `id' for nil:NilClass:
  lib/gitlab/backend/shell_env.rb:9:in `set_env'
  lib/gitlab/satellite/action.rb:20:in `in_locked_and_timed_satellite'
  lib/gitlab/satellite/merge_action.rb:49:in `diff_in_satellite'
  app/models/merge_request.rb:219:in `to_diff'
  app/controllers/projects/merge_requests_controller.rb:42:in `block (2 levels) in show'
```

### What are the relevant issue numbers?

* Closes #1225
* Closes #1854 (dup)
* Closes #1858 (dup)

See merge request !872
 2015-06-23 15:03:00 +00:00
Stan Hu 555fd0cf4a Fix downloading of patches on public merge requests when user logged out 
Closes #1225
Closes #1854
Closes #1858
 2015-06-23 05:34:21 -07:00
Patricio Cano 7ae9c92f9e Merge branch 'ldap-queries' into 'master' 
What sort of LDAP queries does GitLab EE make?

This change adds more documentation.

See merge request !5
 2015-06-22 18:03:31 +00:00
Dmitriy Zaporozhets b21390936a Make provider a select for identities form in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 16:53:11 +02:00
Alex Lossent d96d9aae42 Fix behavior of ldap_person method in Gitlab::OAuth::User 
Code tweaks in 45e9150a caused the ldap_person method to not return expected results.
Improved tests to cover the ldap_person method, which was previously stubbed.
 2015-06-17 18:06:27 +02:00
Dmitriy Zaporozhets ae713ae8fc Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	doc/README.md
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.12.md
	doc/workflow/README.md
 2015-06-17 11:25:59 +02:00
Dmitriy Zaporozhets fe51fa26a7 Dont set checkout sha for removed branch/tag 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-15 17:54:22 +02:00