summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix specsrails_update_to_4_2Valery Sizov2015-11-3017-81/+73
* fix notification_service specsValery Sizov2015-11-304-209/+144
* Migrate mailers to ActiveJobValery Sizov2015-11-2614-36/+67
* Merge remote-tracking branch 'origin/master' into rails_update_to_4_2Valery Sizov2015-11-2624-512/+472
|\
| * Merge branch 'rs-remove-enumerize' into 'master' Dmitriy Zaporozhets2015-11-263-8/+1
| |\
| | * Remove enumerize gemrs-remove-enumerizeRobert Speicher2015-11-253-8/+1
| * | Merge branch 'rs-update-asana' into 'master' Dmitriy Zaporozhets2015-11-262-10/+10
| |\ \
| | * | Bump asana to ~> 0.4.0rs-update-asanaRobert Speicher2015-11-252-10/+10
| | |/
| * | Merge branch 'rs-update-doorkeeper' into 'master' Dmitriy Zaporozhets2015-11-262-3/+3
| |\ \
| | * | Bump doorkeeper to ~> 2.2.0rs-update-doorkeeperRobert Speicher2015-11-252-3/+3
| | |/
| * | Merge branch 'fix-dup-changelog-entry' into 'master' Stan Hu2015-11-261-1/+0
| |\ \
| | * | Remove duplicate entry shipped in 8.1.4Stan Hu2015-11-251-1/+0
| | |/
| * | Merge branch 'rs-rescueexception-cop' into 'master' Dmitriy Zaporozhets2015-11-261-1/+1
| |\ \ | | |/ | |/|
| | * Enable the Lint/RescueException coprs-rescueexception-copRobert Speicher2015-11-241-1/+1
| * | Merge branch 'new-member-page' into 'master' Dmitriy Zaporozhets2015-11-2519-489/+457
| |\ \
| | * | Fix rubocop complainnew-member-pageDmitriy Zaporozhets2015-11-251-2/+5
| | * | Split group feature testsDmitriy Zaporozhets2015-11-2510-356/+380
| | * | Refactor group stepsDmitriy Zaporozhets2015-11-251-61/+16
| | * | Refactor group members tests a bitDmitriy Zaporozhets2015-11-254-27/+15
| | * | Improve project members page UIDmitriy Zaporozhets2015-11-256-49/+36
| | * | Improve UI for group members pageDmitriy Zaporozhets2015-11-255-32/+43
* | | | update test_after_commit gem to 0.4.2Valery Sizov2015-11-262-3/+3
* | | | Rails update to 4.2.4Valery Sizov2015-11-2524-194/+264
|/ / /
* | | Merge branch 'bump-gitlab-shell' into 'master' Dmitriy Zaporozhets2015-11-251-1/+1
|\ \ \
| * | | Bump gitlab-shell to 2.6.8Dmitriy Zaporozhets2015-11-251-1/+1
|/ / /
* | | Merge branch 'sherlock-total-query-time' into 'master' Yorick Peterse2015-11-254-0/+25
|\ \ \ | |/ / |/| |
| * | Added total query time to Sherlocksherlock-total-query-timeYorick Peterse2015-11-244-0/+25
* | | Merge branch 'lfs-doc' into 'master' Robert Schilling2015-11-251-2/+2
|\ \ \
| * | | Add reference to Microsoft's Git Credential Manager for Windows.Eirik Lygre2015-11-241-2/+2
* | | | Merge branch 'rs-update-colorize' into 'master' Dmitriy Zaporozhets2015-11-253-17/+4
|\ \ \ \
| * | | | Remove usage of Coloredrs-update-colorizeRobert Speicher2015-11-241-11/+1
| * | | | Bump colorize to ~> 0.7.0Robert Speicher2015-11-242-6/+3
| |/ / /
* | | | Merge branch 'rs-update-rack-oauth2' into 'master' Dmitriy Zaporozhets2015-11-252-4/+4
|\ \ \ \
| * | | | Bump rack-oauth2 to ~> 1.2.1rs-update-rack-oauth2Robert Speicher2015-11-242-4/+4
| |/ / /
* | | | Merge branch 'rs-update-creole' into 'master' Dmitriy Zaporozhets2015-11-252-3/+3
|\ \ \ \
| * | | | Bump creole to ~> 0.5.0rs-update-creoleRobert Speicher2015-11-242-3/+3
| |/ / /
* | | | Merge branch 'rs-update-gon' into 'master' Dmitriy Zaporozhets2015-11-252-4/+6
|\ \ \ \
| * | | | Bump gon to ~> 6.0.1rs-update-gonRobert Speicher2015-11-242-4/+6
* | | | | Merge branch 'session_expire_delay_cannot_be_nil' into 'master' Robert Speicher2015-11-251-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Also fallback to a default value if none is set.session_expire_delay_cannot_be_nilMarin Jankovski2015-11-241-2/+2
| * | | | Maybe rescue session_expire_delay by setting a default value.Marin Jankovski2015-11-241-0/+1
* | | | | Merge branch 'rs-rescue-standarderror' into 'master' Robert Speicher2015-11-251-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Rescue StandardError, not Exceptionrs-rescue-standarderrorRobert Speicher2015-11-241-1/+1
|/ / / /
* | | | Merge branch 'fix-group-member' into 'master' Dmitriy Zaporozhets2015-11-245-12/+51
|\ \ \ \
| * | | | Small code improvementfix-group-memberDmitriy Zaporozhets2015-11-241-1/+1
| * | | | Fix rubocop complainDmitriy Zaporozhets2015-11-241-1/+1
| * | | | Fix 500 error when update group member permissionDmitriy Zaporozhets2015-11-245-12/+51
| | |/ / | |/| |
* | | | Merge branch 'issue_guidelines_with_omnibus_commands' into 'master' Dmitriy Zaporozhets2015-11-241-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Spell out commands for omnibus-gitlab packages.issue_guidelines_with_omnibus_commandsMarin Jankovski2015-11-241-2/+2
| |/ /
* | | Merge branch 'fix-small-text' into 'master' Dmitriy Zaporozhets2015-11-241-0/+6
|\ \ \ | |/ / |/| |