Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix specsrails_update_to_4_2 | Valery Sizov | 2015-11-30 | 17 | -81/+73 |
* | fix notification_service specs | Valery Sizov | 2015-11-30 | 4 | -209/+144 |
* | Migrate mailers to ActiveJob | Valery Sizov | 2015-11-26 | 14 | -36/+67 |
* | Merge remote-tracking branch 'origin/master' into rails_update_to_4_2 | Valery Sizov | 2015-11-26 | 24 | -512/+472 |
|\ | |||||
| * | Merge branch 'rs-remove-enumerize' into 'master' | Dmitriy Zaporozhets | 2015-11-26 | 3 | -8/+1 |
| |\ | |||||
| | * | Remove enumerize gemrs-remove-enumerize | Robert Speicher | 2015-11-25 | 3 | -8/+1 |
| * | | Merge branch 'rs-update-asana' into 'master' | Dmitriy Zaporozhets | 2015-11-26 | 2 | -10/+10 |
| |\ \ | |||||
| | * | | Bump asana to ~> 0.4.0rs-update-asana | Robert Speicher | 2015-11-25 | 2 | -10/+10 |
| | |/ | |||||
| * | | Merge branch 'rs-update-doorkeeper' into 'master' | Dmitriy Zaporozhets | 2015-11-26 | 2 | -3/+3 |
| |\ \ | |||||
| | * | | Bump doorkeeper to ~> 2.2.0rs-update-doorkeeper | Robert Speicher | 2015-11-25 | 2 | -3/+3 |
| | |/ | |||||
| * | | Merge branch 'fix-dup-changelog-entry' into 'master' | Stan Hu | 2015-11-26 | 1 | -1/+0 |
| |\ \ | |||||
| | * | | Remove duplicate entry shipped in 8.1.4 | Stan Hu | 2015-11-25 | 1 | -1/+0 |
| | |/ | |||||
| * | | Merge branch 'rs-rescueexception-cop' into 'master' | Dmitriy Zaporozhets | 2015-11-26 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Enable the Lint/RescueException coprs-rescueexception-cop | Robert Speicher | 2015-11-24 | 1 | -1/+1 |
| * | | Merge branch 'new-member-page' into 'master' | Dmitriy Zaporozhets | 2015-11-25 | 19 | -489/+457 |
| |\ \ | |||||
| | * | | Fix rubocop complainnew-member-page | Dmitriy Zaporozhets | 2015-11-25 | 1 | -2/+5 |
| | * | | Split group feature tests | Dmitriy Zaporozhets | 2015-11-25 | 10 | -356/+380 |
| | * | | Refactor group steps | Dmitriy Zaporozhets | 2015-11-25 | 1 | -61/+16 |
| | * | | Refactor group members tests a bit | Dmitriy Zaporozhets | 2015-11-25 | 4 | -27/+15 |
| | * | | Improve project members page UI | Dmitriy Zaporozhets | 2015-11-25 | 6 | -49/+36 |
| | * | | Improve UI for group members page | Dmitriy Zaporozhets | 2015-11-25 | 5 | -32/+43 |
* | | | | update test_after_commit gem to 0.4.2 | Valery Sizov | 2015-11-26 | 2 | -3/+3 |
* | | | | Rails update to 4.2.4 | Valery Sizov | 2015-11-25 | 24 | -194/+264 |
|/ / / | |||||
* | | | Merge branch 'bump-gitlab-shell' into 'master' | Dmitriy Zaporozhets | 2015-11-25 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Bump gitlab-shell to 2.6.8 | Dmitriy Zaporozhets | 2015-11-25 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'sherlock-total-query-time' into 'master' | Yorick Peterse | 2015-11-25 | 4 | -0/+25 |
|\ \ \ | |/ / |/| | | |||||
| * | | Added total query time to Sherlocksherlock-total-query-time | Yorick Peterse | 2015-11-24 | 4 | -0/+25 |
* | | | Merge branch 'lfs-doc' into 'master' | Robert Schilling | 2015-11-25 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Add reference to Microsoft's Git Credential Manager for Windows. | Eirik Lygre | 2015-11-24 | 1 | -2/+2 |
* | | | | Merge branch 'rs-update-colorize' into 'master' | Dmitriy Zaporozhets | 2015-11-25 | 3 | -17/+4 |
|\ \ \ \ | |||||
| * | | | | Remove usage of Coloredrs-update-colorize | Robert Speicher | 2015-11-24 | 1 | -11/+1 |
| * | | | | Bump colorize to ~> 0.7.0 | Robert Speicher | 2015-11-24 | 2 | -6/+3 |
| |/ / / | |||||
* | | | | Merge branch 'rs-update-rack-oauth2' into 'master' | Dmitriy Zaporozhets | 2015-11-25 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * | | | | Bump rack-oauth2 to ~> 1.2.1rs-update-rack-oauth2 | Robert Speicher | 2015-11-24 | 2 | -4/+4 |
| |/ / / | |||||
* | | | | Merge branch 'rs-update-creole' into 'master' | Dmitriy Zaporozhets | 2015-11-25 | 2 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Bump creole to ~> 0.5.0rs-update-creole | Robert Speicher | 2015-11-24 | 2 | -3/+3 |
| |/ / / | |||||
* | | | | Merge branch 'rs-update-gon' into 'master' | Dmitriy Zaporozhets | 2015-11-25 | 2 | -4/+6 |
|\ \ \ \ | |||||
| * | | | | Bump gon to ~> 6.0.1rs-update-gon | Robert Speicher | 2015-11-24 | 2 | -4/+6 |
* | | | | | Merge branch 'session_expire_delay_cannot_be_nil' into 'master' | Robert Speicher | 2015-11-25 | 1 | -2/+3 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Also fallback to a default value if none is set.session_expire_delay_cannot_be_nil | Marin Jankovski | 2015-11-24 | 1 | -2/+2 |
| * | | | | Maybe rescue session_expire_delay by setting a default value. | Marin Jankovski | 2015-11-24 | 1 | -0/+1 |
* | | | | | Merge branch 'rs-rescue-standarderror' into 'master' | Robert Speicher | 2015-11-25 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Rescue StandardError, not Exceptionrs-rescue-standarderror | Robert Speicher | 2015-11-24 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch 'fix-group-member' into 'master' | Dmitriy Zaporozhets | 2015-11-24 | 5 | -12/+51 |
|\ \ \ \ | |||||
| * | | | | Small code improvementfix-group-member | Dmitriy Zaporozhets | 2015-11-24 | 1 | -1/+1 |
| * | | | | Fix rubocop complain | Dmitriy Zaporozhets | 2015-11-24 | 1 | -1/+1 |
| * | | | | Fix 500 error when update group member permission | Dmitriy Zaporozhets | 2015-11-24 | 5 | -12/+51 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'issue_guidelines_with_omnibus_commands' into 'master' | Dmitriy Zaporozhets | 2015-11-24 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Spell out commands for omnibus-gitlab packages.issue_guidelines_with_omnibus_commands | Marin Jankovski | 2015-11-24 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'fix-small-text' into 'master' | Dmitriy Zaporozhets | 2015-11-24 | 1 | -0/+6 |
|\ \ \ | |/ / |/| | |