Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump doorkeeper to ~> 2.2.0rs-update-doorkeeper | Robert Speicher | 2015-11-25 | 2 | -3/+3 |
* | 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 |
* | | 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 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix ultra-light color for small textfix-small-text | Dmitriy Zaporozhets | 2015-11-24 | 1 | -0/+6 |
|/ / | |||||
* | | Merge branch 'service-tests' into 'master' | Dmitriy Zaporozhets | 2015-11-24 | 2 | -0/+68 |
|\ \ | |/ |/| | |||||
| * | Add tests for (Create|Update)ReleaseServiceservice-tests | Robert Schilling | 2015-11-23 | 2 | -0/+68 |
* | | Merge branch 'ci-artifacts-path' into 'master' | Robert Speicher | 2015-11-23 | 7 | -6/+22 |
|\ \ | |||||
| * | | Expose artifacts pathci-artifacts-path | Kamil Trzcinski | 2015-11-23 | 7 | -6/+22 |
* | | | Merge branch 'ci-fix-500' into 'master' | Robert Speicher | 2015-11-23 | 4 | -0/+10 |
|\ \ \ | |||||
| * | | | Update CHANGELOG | Robert Speicher | 2015-11-23 | 1 | -0/+2 |
| * | | | Fix 500 when using CIci-fix-500 | Kamil Trzcinski | 2015-11-23 | 4 | -0/+8 |
* | | | | Merge branch 'fix-clipboard-styling-in-create-mr' into 'master' | Robert Speicher | 2015-11-23 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Fix CSS styling for clipboard icon in new MR page | Stan Hu | 2015-11-22 | 1 | -0/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'bundler-audit' into 'master' | Dmitriy Zaporozhets | 2015-11-23 | 3 | -0/+14 |
|\ \ \ \ | |||||
| * | | | | Allow bundler:audit to fail | Dmitriy Zaporozhets | 2015-11-23 | 1 | -0/+1 |
| * | | | | Fix gitlab-ci.yml syntax | Dmitriy Zaporozhets | 2015-11-23 | 1 | -3/+3 |
| * | | | | Add bundler-audit to CI | Dmitriy Zaporozhets | 2015-11-23 | 3 | -0/+13 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'required_version_and_docs_update' into 'master' | Dmitriy Zaporozhets | 2015-11-23 | 6 | -43/+77 |
|\ \ \ \ | |_|_|/ |/| | | |