home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,560 Commits 48 Branches 340 Tags
5-3-stable
Commit Graph
5560 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sytse SijbrandijandJacob Vosmaer d4ad9643be Fix for Resque forking might cause stuck workers for the threaded Sidekiq. 2013-09-25 14:34:16 +02:00
Dmitriy Zaporozhets 0c39f4d593 Merge pull request #4517 from scrobbleme/increase_flash_timout 
Increased flash timeout to 15 seconds
 2013-07-15 00:14:54 -07:00
Dmitriy Zaporozhets 726928106e Merge pull request #4495 from karlhungus/5-3-stable 
Updated sidekiq Gemfile.lock for celluloid error
 2013-07-11 09:22:25 -07:00
Adrian Mörchen 13dc1a896b Increased flash timeout to 15 seconds 2013-07-09 12:56:43 +02:00
Izaak Alpert 04afcbd873 Updated sidekiq Gemfile.lock for celluloid error 
Should (hopefully fix issue with: "Mysql2::Error: This connection is still waiting for a result, try again once you have the result:"

https://github.com/mperham/sidekiq/pull/954
https://github.com/celluloid/celluloid/pull/268

Change-Id: I4daa65b6b6f9de20975d95ba07ffab103ec03204
 2013-07-04 12:12:12 -04:00
Dmitriy Zaporozhets e1c473c13d Merge pull request #4387 from Razer6/fix_update_docs_for_5_3_stable 
Add missing update docs from 5.2 to 5.3 to 5.3 stable branch
 2013-06-26 12:54:52 -07:00
Dmitriy Zaporozhets 38722ac14d Merge pull request #4420 from martinlauer/patch-1 
raise App Version to stable Branch 5.3
 2013-06-25 05:36:50 -07:00
Martin Lauer ff2af99ca7 raise App Version to stable Branch 5.3 2013-06-25 14:32:52 +02:00
Robert Schilling 5c74c31484 Add fixed update docs 2013-06-22 13:34:34 +02:00
Dmitriy Zaporozhets 148eade9d7 Version to 5.3 v5.3.0 2013-06-19 19:57:32 +03:00
Dmitriy Zaporozhets d899fcdd2d Merge pull request #4325 from zzet/patch-1 
Remove unused but slow code
 2013-06-18 11:31:17 -07:00
Dmitriy Zaporozhets cc5440e82a Use navless layout for snippets page 2013-06-18 17:43:49 +03:00
Dmitriy Zaporozhets 68b601f6af Fix Issue.open_for 2013-06-17 20:00:50 +03:00
Yves Senn ed9b661c9d Merge pull request #4279 from barendt/patch-2 
Fix paths to the Contents Markdown pages
 2013-06-17 06:05:10 -07:00
Andrew Kumanyaev 26994b5d30 Remove unused, but slow code 2013-06-17 15:52:54 +04:00
Dmitriy Zaporozhets 2e839cee93 Fixed tests. Fixed overrided scope. Better usability for milestone view 2013-06-17 11:57:37 +03:00
Dmitriy Zaporozhets b1bdd82992 Merge pull request #4269 from dosire/scrum-view-for-milestone 
Scrum view style milestone view.
 2013-06-16 23:32:09 -07:00
Dmitriy Zaporozhets 593dfc40df FIx userteams tests 2013-06-15 13:10:43 +03:00
Dmitriy Zaporozhets 48e5dff99c Fix MR feature 2013-06-14 19:58:16 +03:00
Dmitriy Zaporozhets 940c05086e Check for existing MR only for opened/reopened MR 2013-06-14 17:19:26 +03:00
Dmitriy Zaporozhets e7c930a55b Add imported boolean to project. Prevent shell from creating repo after it was imported 2013-06-14 16:30:48 +03:00
Dmitriy Zaporozhets da98cebc5b Merge pull request #4314 from Undev/feature/redesign_forms 
Switch form from table to plain form without member list
 2013-06-14 05:20:22 -07:00
Dmitriy Zaporozhets a59fe739fe IMprove MR validation logic 2013-06-14 15:17:47 +03:00
Sytse Sijbrandij f7ea649f4b Implement (style) suggestions. 2013-06-14 14:13:14 +02:00
Dmitriy Zaporozhets 977146f568 Prevent creating several open merge requests for same branches 2013-06-14 15:03:22 +03:00
Dmitriy Zaporozhets b4e8fea274 Refactor grack auth module. Add git over http wiki support 2013-06-14 14:42:55 +03:00
Andrey Kumanyaev 815c186b29 Switch for from table to plain form without member list 2013-06-14 15:08:21 +04:00
Dmitriy Zaporozhets a8bcb9a5d5 Fix mailer test 2013-06-14 12:58:12 +03:00
Dmitriy Zaporozhets 1cbfc8d0af Fix tab tests. Prevent 500 if user.last_sign_in_at is nil 2013-06-14 08:37:55 +03:00
Dmitriy Zaporozhets 74c8a635ce Move project nav checks to helper 2013-06-13 22:58:27 +03:00
Dmitriy Zaporozhets 313ac55539 Merge branch 'feature/password_expire' of /home/git/repositories/gitlab/gitlabhq 2013-06-13 18:09:26 +00:00
Dmitriy Zaporozhets 6838304a85 Force user password change for users created by admin 2013-06-13 21:06:27 +03:00
Dmitriy Zaporozhets 00882b3c33 Prevent infinit password change by settin password_expires_at to nil 2013-06-13 20:21:51 +03:00
Dmitriy Zaporozhets 46231f0f1d Fix password set form and infinite loop 2013-06-13 20:16:48 +03:00
Dmitriy Zaporozhets fbf6989903 Force admin to change password after first sign-in 2013-06-13 20:06:33 +03:00
Dmitriy Zaporozhets 94be732026 Add password_expires_at to users table 2013-06-13 20:01:35 +03:00
Dmitriy Zaporozhets cfd15eb480 Better naming for some project tabs 2013-06-13 19:56:26 +03:00
Dmitriy Zaporozhets 5b40780290 Password expire: implement password resource inside profile. add before_fiter check 2013-06-13 19:53:04 +03:00
Dmitriy Zaporozhets 81a9e81fae use bold font for active tab 2013-06-13 17:47:04 +03:00
Dmitriy Zaporozhets 200c5f5894 Better commit button after file edit 2013-06-13 17:41:21 +03:00
Dmitriy Zaporozhets 18ea0e0ea7 Prevent overflow of comment code in event body. Add border-radius to highlight code inside note body 2013-06-13 10:59:27 +03:00
Dmitriy Zaporozhets 7a53215d75 Hide sign-in bottom block if no providers 2013-06-13 10:42:45 +03:00
Dmitriy Zaporozhets 23b3f0518b Team admin should be able to see settings tab 2013-06-13 10:24:01 +03:00
Dmitriy Zaporozhets a6e44bfdae Merge pull request #4296 from mmlb/fix-asciidoc-rendering 
Add asciidoctor gem.
 2013-06-13 00:15:52 -07:00
Dmitriy Zaporozhets 96c06d7f5f update omniauth dependency 2013-06-13 10:07:06 +03:00
Dmitriy Zaporozhets 2c3ddacbd7 Disable threadsafe! for rake tasks 2013-06-13 09:58:03 +03:00
Manuel MendezandManuel Mendez 0023a27ec0 Add asciidoctor gem. 
Fixes issue #3506.
 2013-06-12 16:20:58 -07:00
Dmitriy Zaporozhets 995e656add Add path blacklist 2013-06-12 22:11:35 +03:00
Dmitriy Zaporozhets 8f52501eb5 Fix inline diff issue. See #3150 2013-06-12 16:43:58 +03:00
Dmitriy Zaporozhets 5d0929458c Merge branch 'sing-test-in-readme' of /home/git/repositories/gitlab/gitlabhq 2013-06-12 10:43:45 +00:00