root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
62,694 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

2422 Commits

Author SHA1 Message Date
Douwe Maan 38ff8cd13d Merge branch 'sha-handling' into 'master' 
Adds requirements that supports anything in sha params

Closes #26561 and #2709

See merge request gitlab-org/gitlab-ce!14462
 2017-10-16 15:14:42 +00:00
Alejandro Rodríguez 9fdde3693b Move line code generation into Gitlab::Git 
Having a distinct class just for that was a bit overkill
 2017-10-12 22:13:05 -03:00
Alejandro Rodríguez faa9bd402d Create a Gitlab::Git submodule for conlict-related files 
Rename classes to (hopefully) clearer names while we're doing that.
 2017-10-12 22:03:15 -03:00
Alejandro Rodríguez f72598b659 Move Gitlab::Diff::LineCode to module Gitlab::Git 2017-10-12 21:45:16 -03:00
Guilherme Vieira 771b777ab5 Adds requirements that supports anything in sha params 2017-10-12 18:46:41 -03:00
Douwe Maan 025c6eeaa1 Move all API authentication code to APIGuard 2017-10-12 11:13:37 +02:00
Sean McGivern a68a39e341 Merge branch '18608-lock-issues-v2' into 'master' 
Resolve "Lock issue and merge request"

Closes #18608

See merge request gitlab-org/gitlab-ce!14531
 2017-10-06 16:47:27 +00:00
Douwe Maan 7f8e720f41 Merge branch 'api-sentry-extra' into 'master' 
Send API parameters as extra data for sentry errors

See merge request gitlab-org/gitlab-ce!14644
 2017-10-06 13:41:01 +00:00
Alejandro Rodríguez 60a35e4230 Send API parameters as extra data for sentry errors 2017-10-05 18:31:34 -03:00
Douwe Maan 0c0c2ecd99 Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_emails 
# Conflicts:
#	app/controllers/admin/users_controller.rb
#	app/controllers/confirmations_controller.rb
#	app/controllers/profiles/emails_controller.rb
#	app/models/user.rb
#	app/services/emails/base_service.rb
#	app/services/emails/destroy_service.rb
#	app/views/devise/mailer/confirmation_instructions.html.haml
#	lib/api/users.rb
#	spec/services/emails/destroy_service_spec.rb
 2017-10-05 12:48:22 +02:00
Vitaliy @blackst0ne Klachkov c55a9ac4ae Remove 'Repo' prefix from API entites 2017-10-05 19:48:05 +11:00
Kamil Trzciński da9d42f2b3 Merge branch '37970-timestamped-ci' into 'master' 
Hide CI section markers from job trace

See merge request gitlab-org/gitlab-ce!14393
 2017-10-03 18:16:54 +00:00
Alessio Caiazza 79e1f33f13 Expose GitLab features to the CI runner 2017-10-03 11:35:23 +02:00
Jarka Kadlecova c488bcd13e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues-v2 
# Conflicts:
#	db/schema.rb
 2017-10-03 09:37:48 +02:00
Sean McGivern 664cd27faa Merge branch '38571-fix-exception-in-raven-report' into 'master' 
Ensure no exception is raised when Raven tries to get the current user in API context

Closes #38571

See merge request gitlab-org/gitlab-ce!14580
 2017-10-02 08:35:12 +00:00
David Turner 01ce58bde4 add username to authorized result, so that gitlab-shell can pass it to hooks 2017-09-29 18:16:55 -04:00
Rémy Coutable 3040b994df
Ensure no exception is raised when Raven tries to get the current user in API context 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-09-29 18:57:22 +02:00
Markus Koller e9eae3eb0d Support custom attributes on users 2017-09-28 16:49:42 +00:00
Sean McGivern 3209c07140 Merge branch 'dm-api-unauthorized' into 'master' 
Make sure API responds with 401 when invalid authentication info is provided

Closes #38438

See merge request gitlab-org/gitlab-ce!14525
 2017-09-28 14:42:40 +00:00
Douwe Maan b6c5a73c0b Make sure API responds with 401 when invalid authentication info is provided 2017-09-28 14:17:52 +02:00
James Lopez 1dcb711110 refactor emails service 2017-09-28 08:46:39 +02:00
James Lopez 67d06dee30 refactor users update service 2017-09-28 08:46:39 +02:00
James Lopez 9621dd0c9d refactor services to match EE signature 2017-09-28 08:46:39 +02:00
Rémy Coutable da7353d36c Merge branch '37467-helper-method-from-users-endpoint-overrides-api-helper-method' into 'master' 
find_user users helper method no longer overrides find_user API helper method.

Closes #37467

See merge request gitlab-org/gitlab-ce!14418
 2017-09-27 11:29:57 +00:00
Tiago Botelho d70b7a490d find_user users helper method no longer overrides find_user API helper method. 2017-09-26 19:14:19 +01:00
Rémy Coutable 6d1498ab4e Merge branch 'dm-simple-project-avatar-url' into 'master' 
Expose avatar_url when requesting list of projects from API with simple=true

See merge request gitlab-org/gitlab-ce!14498
 2017-09-26 14:28:38 +00:00
Mehdi Lahmam f696b04cc8 Expose last pipeline details in API response when getting a single commit 
Closes #35692.
 2017-09-26 13:08:46 +02:00
Douwe Maan a019369409 Expose avatar_url when requesting list of projects from API with simple=true 2017-09-26 12:47:48 +02:00
Brett Walker b2d5379161 fix calls to Emails::DestroyService 2017-09-23 15:24:53 +02:00
Brett Walker f9f4672275 Send a confirmation email when the user adds a secondary email address. Utilizes the Devise `confirmable` capabilities. Issue #37385 2017-09-23 15:23:11 +02:00
Luke "Jared" Bennett ff7b545c8e
Merge remote-tracking branch 'origin/master' into 18608-lock-issues 2017-09-20 15:23:00 +01:00
Rémy Coutable d247841b48 Merge branch '20049-projects-api-forks' into 'master' 
Resolve "make project data via API report forks of this project"

Closes #20049

See merge request gitlab-org/gitlab-ce!14355
 2017-09-20 09:51:00 +00:00
Mark Fletcher 63e0a42317 Add an API endpoint to determine the forks of a project 2017-09-20 08:27:16 +10:00
Andrew Newdigate 64d7ec0a9e Detect n+1 issues involving Gitaly 2017-09-19 10:55:37 +00:00
haseeb ff4e81e0ae fix #35290 Make read-only API for public merge requests available without authentication 2017-09-18 17:29:17 +00:00
Rémy Coutable 8d568fe324 Merge branch 'add_closed_at_attribute' into 'master' 
Add 'closed_at' attribute to Issues API

Closes #5935

See merge request gitlab-org/gitlab-ce!14316
 2017-09-18 16:37:02 +00:00
Luke "Jared" Bennett 9ca7c94f66
Merge remote-tracking branch 'origin/master' into 18608-lock-issues 2017-09-18 10:54:12 +01:00
Vitaliy @blackst0ne Klachkov c0845e837d Add 'closed_at' attribute to Issues API 2017-09-16 20:51:02 +11:00
Robert Speicher 3cbaed97f1 Ensure we use `Entities::User` for non-admin `users/:id` API requests 2017-09-15 19:34:52 -04:00
Jarka Kadlecova 994e7d1359 Create system notes for MR too, improve doc + clean up code 2017-09-14 14:50:32 +02:00
Jarka Kadlecova 073ba05d31 Support discussion lock in the API 2017-09-14 14:50:32 +02:00
Robert Speicher 33010da28b Merge branch 'sh-exclude-api-responses' into 'master' 
Exclude logging of API responses to prevent leakage of confidential data

See merge request !14245
 2017-09-13 14:24:29 +00:00
Stan Hu b60cebb931 Exclude logging of API responses to prevent leakage of confidential data 2017-09-13 01:25:33 -07:00
Grzegorz Bizon b097d065c5 Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master' 
Resolve "Move `lib/ci` to `lib/gitlab/ci`"

Closes #5836

See merge request !14078
 2017-09-13 07:21:41 +00:00
Maxim Rydkin c45ace8972
move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb` 2017-09-12 22:32:02 +03:00
Annabel Dunstone Gray 9b177bb7c9 Revert "Merge branch 'revert-f2421b2b' into 'master'" 
This reverts merge request !14148
 2017-09-11 15:44:42 +00:00
Rubén Dávila 52a2423e37 Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" 
This reverts merge request !13619
 2017-09-08 14:48:44 +00:00
Ruben Davila 62bb6235c2 Make Members with Owner and Master roles always able to create subgroups 2017-09-07 13:47:58 -05:00
Sean McGivern 7e19b5bfb6 Merge branch 'sh-add-grape-logging' into 'master' 
Add JSON logger in `log/api_json.log` for Grape API endpoints

Closes #36189

See merge request !14102
 2017-09-07 17:39:14 +00:00
Douwe Maan 523a1c69ab Merge branch '23079-remove-default-scope-in-sortable' into 'master' 
Removes default scope from sortable

Closes #23079

See merge request !13558
 2017-09-07 16:15:32 +00:00