home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 13:06:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,924 Commits 48 Branches 340 Tags
f07b26fcefdf363fc97a495e83aeb8351bbcd8bc
Commit Graph
659 Commits
Author SHA1 Message Date
Douwe Maan bf29e33d5d Rename issued_at to starts_at. 2015-05-21 19:50:57 +02: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
Dmitriy Zaporozhets a13e6f13c7 Fix gemfile.lock 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-15 08:57:20 +03:00
Douwe Maan 37bc4bb199 Merge branch 'fix-blob-path' into 'master' 
Fix broken view when viewing history of a file that includes a path that used to be another file

Requires gitlab_git to v7.1.12 to be tagged and released.

Closes #1598

See merge request !651
 2015-05-14 17:47:23 +00:00
Dmitriy Zaporozhets c2ee828c19 Merge branch 'omniauth-csrf' into 'master' 
Protect OmniAuth request phase against CSRF.

Addresses #2268.

See merge request !1793
 2015-05-14 14:22:26 +00:00
Stan Hu 28797d3adc Fix broken view when viewing history of a file that includes a path that used to be another file 
Closes #1598
 2015-05-13 21:03:27 -07: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 4a373be861 Merge branch '2fa' into 'master' 
Two-factor authentication

Implement's Two-factor authentication using tokens.

- [X] Authentication logic
- [X] Enable/disable 2FA feature
- [x] Make 2-step login process if 2FA enabled
- [x] Backup codes
- [x] Backup code removed after being used
- [x] Check backup codes for mysql db (mention mysql limitation if applied)
- [x] Add tests
- [x] Test if https://github.com/tinfoil/devise-two-factor#disabling-automatic-login-after-password-resets applies, and address if so
- [x] Wait for fixed version of `attr_encrypted` or fork and use forked version - https://github.com/attr-encrypted/attr_encrypted/issues/155

Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/4516817-implement-two-factor-authentication-2fa

See merge request !474
 2015-05-12 09:41:27 +00:00
Douwe Maan 8e4dcbb8fb Merge branch 'fix-tags-view-with-submodules' into 'master' 
Bump gitlab_git to 7.1.11 to fix bug with viewing a tag on a project with submodules

This is a reminder MR to bump gitlab_git before the release. Tests will fail until this happens.

Closes https://github.com/gitlabhq/gitlabhq/issues/8411

See merge request !607
 2015-05-12 09:11:45 +00:00
Dmitriy Zaporozhets 22badc1313 Bump attr_encrypted 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-12 10:41:24 +03:00
Dmitriy ZaporozhetsandRobert Speicher b66be0a2b3 Use non-broken version of attr_encrypted 2015-05-09 17:31:11 -04:00
Dmitriy ZaporozhetsandRobert Speicher fe75411df8 Add 2 factor authentication gems 2015-05-09 17:30:50 -04:00
Robert Speicher 0a99e6e2fa Remove 'jasmine' gem 
jasmine-rails still requires it as a dependency, but for some reason
running `rake jasmine:ci` produced test failures but
`rake spec:javascript` didn't.
 2015-05-06 15:31:24 -04:00
Robert Speicher bc14d223a7 Add task_list gem 2015-05-06 12:58:26 -04:00
Douwe Maan 2bb2ade50d Merge branch 'master' into license 
# Conflicts:
#	db/schema.rb
 2015-05-05 13:03:33 +02:00
Douwe Maan 6d093d84b1 Show prettier error message when license file is invalid. 2015-05-05 11:49:28 +02:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02:00
Stan Hu e27bc577af Bump gitlab_git to 7.1.11 to fix bug where viewing a tag on a project with submodules would return a 500 error 
Closes https://github.com/gitlabhq/gitlabhq/issues/8411
 2015-05-04 10:37:44 -07:00
Douwe Maan d1f2b09fad Allow license to be uploaded and enforce its validity. 2015-05-01 14:52:30 +02:00
jubianchi 3070b2cfc7 Add a rake task to automatically restart foreman when changes occur 2015-04-27 21:32:41 +02:00
Jeroen van Baarsen bb8c1cadf3 Merge pull request #9209 from Soullivaneuh/bootstrap-update 
Bootstrap 3.3.4
 2015-04-27 13:19:35 +02:00
Dmitriy Zaporozhets 2e243fc321 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	README.md
	VERSION
	app/controllers/projects/services_controller.rb
	app/controllers/projects/uploads_controller.rb
	app/services/test_hook_service.rb
	db/schema.rb
	features/steps/admin/settings.rb
	lib/gitlab/reference_extractor.rb
	spec/models/note_spec.rb
 2015-04-27 11:53:31 +03:00
Sullivan SENECHAL 76e720dfa9 Bootstrap 3.3.4 2015-04-27 00:00:17 +02:00
Robert Speicher 3bb2f37816 Add capybara-screenshot gem 2015-04-25 21:33:15 -04:00
Douwe Maan 571ba5a7fe Protect OmniAuth request phase against CSRF. 2015-04-24 17:03:18 +02:00
Dmitriy Zaporozhets f502b293e5 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
	spec/helpers/gitlab_markdown_helper_spec.rb
 2015-04-24 11:22:54 +03:00
Robert Speicher d086e76c2f Update jquery-atwho-rails 2015-04-23 13:08:16 -04:00
Robert Speicher af855b573f Update d3_rails 2015-04-23 13:07:44 -04:00
Dmitriy Zaporozhets a22f3139f3 Merge branch 'rs-reply-hotkey' into 'master' 
"Reply quoting selected text" shortcut/hotkey

Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms.

This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs.

See merge request !1775
 2015-04-22 19:57:40 +00:00
Marin Jankovski 9ba85ffe88 Update gitlab-grack to 2.0.2. 2015-04-22 11:19:40 +02:00
Robert Speicher 837dc328bf Change html-pipeline-gitlab gem to html-pipeline 2015-04-21 12:53:42 -04:00
Dmitriy Zaporozhets 2505300b7b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/import/google_code_controller.rb
 2015-04-21 15:36:58 +03:00
Jeroen van Baarsen d128bc9241 Merge pull request #9058 from chulkilee/upgrade-hipchat 
upgrade hipchat
 2015-04-21 11:45:48 +02:00
Douwe Maan 5bbe2860bf Update gitlab-grack to 2.0.1 to get unicorn to stop creating zombies. 2015-04-20 18:48:53 +02:00
Dmitriy Zaporozhets 5b10796235 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/project.rb
	db/schema.rb
 2015-04-20 19:19:27 +03:00
Robert Speicher 0fab35217c Add jasmine-rails gem 2015-04-18 15:17:25 -04:00
Robert Speicher 7679c500ab Update jasmine gem 2015-04-18 15:17:24 -04:00
Douwe Maan 865444f1d8 Ignore submodules that are defined in .gitmodules but are checked in as directories. 2015-04-17 20:51:12 +02:00
Douwe Maan 2d913e5a9a Update gitlab_git to ignore invalid lines in .gitmodules. 2015-04-17 12:23:28 +02:00
Dmitriy Zaporozhets d01d0c02b7 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/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb
 2015-04-15 19:22:57 +03:00
Dmitriy Zaporozhets 1970dabea6 Merge pull request #9039 from gemnasium/update-gemnasium-gitlab-service-to-0-2-6 
Update gemnasium-gitlab-service to 0.2.6
 2015-04-15 15:33:09 +03:00
Dmitriy Zaporozhets ef8d96e5de Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	LICENSE
	app/assets/javascripts/dispatcher.js.coffee
	app/controllers/help_controller.rb
	app/models/user.rb
	app/views/groups/group_members/_new_group_member.html.haml
	config/gitlab.yml.example
	config/routes.rb
	features/groups.feature
	features/steps/dashboard/help.rb
 2015-04-14 15:08:19 +03:00
Chulki Lee 44535f9375 upgrade hipchat 2015-04-13 22:13:16 -07:00
Robert Speicher b142d449c6 Update redcarpet to 3.2.3 2015-04-09 17:28:45 -04:00
Douwe Maan cef0fe244f Update gitlab_git to 7.1.6 because 7.1.5 had broken language detection. 2015-03-31 14:17:20 +02:00
Douwe Maan e7bbd85b34 Limit number of concurrent archive_repo jobs to 2. 2015-03-31 12:52:20 +02:00
Douwe Maan 5ad0eb4378 Update gitlab_git to 7.1.5, to fix final line in EmailsOnPush email diff being rendered as error. 2015-03-31 12:37:14 +02:00
Dmitriy Zaporozhets ccab346a78 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-29 03:32:28 -07:00
Dmitriy Zaporozhets 5f3a758721 Merge branch 'fix-plain-diffs' into 'master' 
Remove the email patches link for merge commits

Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches.  This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit.  Together these changes should prevent the 500 errors described in the issue.

cc @sytse

See merge request !1737
 2015-03-29 10:32:27 +00:00