home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
564 Commits
Author SHA1 Message Date
Stan Hu 0cd73885e6 Fix git blame syntax highlighting when different commits break up lines 
Closes #1521
 2015-05-27 14:10:58 -07:00
Alex Lossent 22de5443c5 Add SAML support via Omniauth 2015-05-27 16:38:10 +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 3b22cfe600 Remove Rack Attack monkey patches and bump to version 4.3.0 2015-05-22 16:25:03 -04:00
Job van der Voort 3a3f4b41e6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-21 10:38:22 +02:00
Jeroen van Baarsen 5b44a54239 Updated the gitlab_git gem 
**What does this do?**
It updated the version of gitlab_git to the latest version

**Why is this needed?*
There was a bug in rugged (dependency of gitlab_git) that causes a segfault
error when seeding the database. That error has been fixed and the fix is in the
latest version of gitlab_git

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-05-21 09:30:23 +02: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
Robert Speicher 8ee382087d Subclass TaskList::Filter to fix a bug 
Instead of using a fork, we subclass the filter and only apply the
`task-list` class to list items that actually are task lists.

Closes #1645

See https://github.com/github/task_list/pull/60
 2015-05-20 12:08:33 -04:00
Jakub Jirutka dc348baf18 Update asciidoctor gem to the latest version 2015-05-18 20:46:19 +02: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 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
Jakub Jirutka 2391a43a70 Make omniauth-kerberos dependency optional (add group 'kerberos') 2015-05-11 13:27:51 +02: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
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
jubianchi 3070b2cfc7 Add a rake task to automatically restart foreman when changes occur 2015-04-27 21:32:41 +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
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
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
Chulki Lee 44535f9375 upgrade hipchat 2015-04-13 22:13:16 -07:00
Dmitriy Zaporozhets ecb58dacd6 Merge branch 'reference-access-control' into 'master' 
Only allow users to reference groups, projects, issues, MRs, commits they have access to.

Addresses https://dev.gitlab.org/gitlab/gitlabhq/issues/2183.

See merge request !1742
 2015-04-13 14:10:25 +00:00
Robert Speicher b142d449c6 Update redcarpet to 3.2.3 2015-04-09 17:28:45 -04:00
Douwe Maan 7b9ae32eff Allow byebug to be used in test. 2015-04-03 18:02:16 +02: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 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
Nihad Abbasov be65373fc7 update acts-as-taggable-on 2015-03-29 03:39:32 +04:00
Vinnie Okada fabaeb096f Upgrade gitlab_git gem to version 7.1.3 2015-03-28 09:10:12 -06:00
Vinnie Okada c5b5c2e7a5 Add sidetiq dependency 
Add the sidetiq gem to the Gemfile to match EE.
 2015-03-21 09:34:33 -06:00
Valery Sizov 484524e096 gollum-lib update 2015-03-20 15:15:56 +02:00
Valery Sizov 5df1609c82 update doorkeeper to 2.1.3 2015-03-20 15:13:38 +02:00
Dmitriy Zaporozhets b99221e6f0 Merge branch 'revert-unicorn-timeout' into 'master' 
Revert "Increase timeout for Git-over-HTTP requests."

This reverts commit 516bcabbf4.

For #2164

cc @marin @douwe

See merge request !1730
 2015-03-20 02:01:38 +00:00