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
19,755 Commits 48 Branches 340 Tags
b583bb5fcbb0ea609c0895f95ebdb45bb4f2eea0
Commit Graph
645 Commits
Author SHA1 Message Date
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
Douwe Maan ad55f0d6f9 Merge branch 'master' into comment-updated-by 2015-08-07 15:05:17 +02:00
Dmitriy Zaporozhets cba7f20dc8 Allow users to send abuse reports 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 14:03:27 +02:00
Valery Sizov 04dd345bf6 Remove Invalid approvers records 2015-07-31 14:09:43 +03:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +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
Marin Jankovski 6e08e7aac4 Check if session_expire_delay column exists before adding the column. 2015-07-22 17:04:49 +02:00
Valery Sizov d3dc2b912f Rename reset_approvers checkbox 2015-07-19 12:35:20 +03:00
Valery Sizov 3cc78d8998 Approvers: UI for project settings 2015-07-17 17:58:33 +03:00
Dmitriy Zaporozhets f0116f1335 Store commit count in project table 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-17 15:22:56 +02:00
Dmitriy Zaporozhets 881fbe5070 Add more seed projects. Control amount with SIZE env variable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-17 13:59:40 +02:00
Sytse Sijbrandij b3ab0e4efb Revert "Change default admin password from "5iveL!fe" to "password"" 
This reverts commit 8a01a12228.
 2015-07-14 17:59:36 +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 5f34759ecb Allow user to specify content he wants to see on project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 18:24:15 +02:00
Valery Sizov f308feb4b3 Reset approvers on push 2015-07-10 18:09:32 +03:00
Dmitriy Zaporozhets 77fb7e078e Fix db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 12:49:06 +02:00
Dmitriy Zaporozhets d192f921c1 Move project activity to separate tab. Add more features to project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-07 16:01:12 +02:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03: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
Robert Speicher 8a01a12228 Change default admin password from "5iveL!fe" to "password" 2015-06-24 18:42:34 -04:00
Robert Speicher aedb546964 Correct AddDefaultOtpRequiredForLoginValue migration 
Also MySQL complains when you change a field to be not null if any
existing records already have a null value, so this updates those rows.
 2015-06-22 11:36:11 -04:00
Robert Speicher d3ff8c1a95 Make default value for otp_required_for_login false instead of null 2015-06-20 19:40:48 -04: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
Robert Speicher 2bc4fd2d04 Add dashboard attribute to User model 2015-06-13 17:59:11 -04:00
Robert Speicher 5f20574db5 Fix a few remaining references to the old Theme names/IDs 2015-06-13 17:58:17 -04:00
Robert Speicher 567a25b630 Ensure session_expire_delay field exists before accessing it 
Closes #1798
 2015-06-13 00:31:08 -04:00
Dmitriy Zaporozhets f840903112 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/tab_helper.rb
	app/models/merge_request.rb
	app/views/layouts/nav/_project_settings.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	doc/api/groups.md
 2015-06-12 11:16:28 +02:00
themaze75andEric Maziade 1d080f5745 session_expire_seconds => session_expire_delay 
delay is in seconds
more legible code in session_store
Added `GitLab restart required` help block to session_expire_delay
 2015-06-10 22:10:00 -04:00
Dmitriy Zaporozhets 747f66559e Merge branch 'mr-approves' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
 2015-06-10 16:51:07 +02:00
Dmitriy Zaporozhets 73faf3c728 Rename approve->approval. Add approval count to project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 15:57:34 +02:00
Dmitriy Zaporozhets 7ba4e05ffa Create Approve model for merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 13:38:47 +02:00
Douwe Maan 844cca4a1e Add Git hook to validate maximum file size. 2015-06-09 10:23:38 +02:00
Eric Maziade 84a414fe53 Add session expiration delay configuration through UI application 
settings
 2015-06-05 11:50:37 -04:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Alex Lossent 60225a067d Allow to configure a URL to show after sign out 2015-05-29 18:20:15 +02:00
Douwe Maan 96d6fdc27c Add option to disallow users from registering any application to use GitLab as an OAuth provider 2015-05-29 13:29:16 +02:00
Dmitriy Zaporozhets b23025b669 Merge branch 'rs-gems' into 'master' 
Update ffaker gem

Adds a version requirement which it didn't have before, at 2.0.0. This version has breaking API changes in that the namespace is now `FFaker` instead of `Faker`.

Prior, if a new developer checked out the repo, ran `bundle install` and then tried `rake dev:setup`, seeding would fail due to having the latest version of ffaker without the API changes in this MR.

Also updates `spring` version and the binstubs, just for kicks.

See merge request !686
 2015-05-26 14:42:15 +00:00
Stan Hu deeff56967 Add support for Webhook note events 
Closes https://github.com/gitlabhq/gitlabhq/issues/6745
 2015-05-21 23:48:16 -04:00
Robert Speicher 9789b56a31 Update ffaker gem 
Adds a version requirement which it didn't have before, at 2.0.0. This
version has breaking API changes in that the namespace is now `FFaker`
instead of `Faker`.
 2015-05-20 19:22:00 -04:00
Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html
 2015-05-15 13:29:58 +03:00
Robert Speicher a9103eae3a Make more migrations reversible 
[ci skip]
 2015-05-13 11:03:29 -04:00
Dmitriy Zaporozhets f32a045ef4 Merge branch 'version-check' into 'master' 
Version check

See merge request !1509
 2015-05-13 11:17:16 +00:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Dmitriy Zaporozhets 474023b71a Fix Gemfile.lock 2015-05-12 14:26:46 +03:00
Dmitriy Zaporozhets 1a1e42ad31 Merge branch 'rs-system-note' into 'master' 
Add SystemNoteService class

The Note model was basically two models crammed together - one handling user-created notes
(i.e., comments on things) and one handling system-created notes (i.e., references).
This splits out the system-specific stuff to a new SystemNoteService class.

See merge request !595
 2015-05-12 10:45:42 +00:00
Valery Sizov 071f07b673 Merge branch 'fix_migration' into 'master' 
Make migrations reversible

/cc @jacobvosmaer @marin

See merge request !622
 2015-05-12 09:51:14 +00:00
Robert Speicher cdb69d728c Add migration to convert legacy system notes 2015-05-11 00:01:15 -04:00
Robert Speicher 0c113c8dcb Make otp_backup_codes a text field 2015-05-09 17:32:46 -04:00
Dmitriy ZaporozhetsandRobert Speicher 802fcd051f Add support for backup codes 2015-05-09 17:31:37 -04:00
Dmitriy ZaporozhetsandRobert Speicher 7302395142 Init 2 factor authentication for user model 2015-05-09 17:31:07 -04:00