summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump doorkeeper to ~> 2.2.0rs-update-doorkeeperRobert Speicher2015-11-252-3/+3
* 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
* | 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
|\ \ \ | |/ / |/| |
| * | Fix ultra-light color for small textfix-small-textDmitriy Zaporozhets2015-11-241-0/+6
|/ /
* | Merge branch 'service-tests' into 'master' Dmitriy Zaporozhets2015-11-242-0/+68
|\ \ | |/ |/|
| * Add tests for (Create|Update)ReleaseServiceservice-testsRobert Schilling2015-11-232-0/+68
* | Merge branch 'ci-artifacts-path' into 'master' Robert Speicher2015-11-237-6/+22
|\ \
| * | Expose artifacts pathci-artifacts-pathKamil Trzcinski2015-11-237-6/+22
* | | Merge branch 'ci-fix-500' into 'master' Robert Speicher2015-11-234-0/+10
|\ \ \
| * | | Update CHANGELOGRobert Speicher2015-11-231-0/+2
| * | | Fix 500 when using CIci-fix-500Kamil Trzcinski2015-11-234-0/+8
* | | | Merge branch 'fix-clipboard-styling-in-create-mr' into 'master' Robert Speicher2015-11-231-0/+4
|\ \ \ \
| * | | | Fix CSS styling for clipboard icon in new MR pageStan Hu2015-11-221-0/+4
| | |/ / | |/| |
* | | | Merge branch 'bundler-audit' into 'master' Dmitriy Zaporozhets2015-11-233-0/+14
|\ \ \ \
| * | | | Allow bundler:audit to failDmitriy Zaporozhets2015-11-231-0/+1
| * | | | Fix gitlab-ci.yml syntaxDmitriy Zaporozhets2015-11-231-3/+3
| * | | | Add bundler-audit to CIDmitriy Zaporozhets2015-11-233-0/+13
| | |/ / | |/| |
* | | | Merge branch 'required_version_and_docs_update' into 'master' Dmitriy Zaporozhets2015-11-236-43/+77
|\ \ \ \ | |_|_|/ |/| | |