Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Deprecate and split old doc on adding usersdocs/membership-refactor | Achilleas Pipinellis | 2016-10-04 | 8 | -116/+114 |
* | Set up the main structure for the membership docs | Achilleas Pipinellis | 2016-10-04 | 10 | -1/+43 |
* | Merge branch 'master' into 'master' | Rémy Coutable | 2016-10-03 | 10 | -24/+25 |
|\ | |||||
| * | Merge branch 'master' of https://gitlab.com/secustor/gitlab-ce.git | secustor | 2016-10-03 | 0 | -0/+0 |
| |\ | |||||
| | * | Merge branch 'master' of https://gitlab.com/secustor/gitlab-ce.git | sebastian.poxhofer | 2016-10-02 | 0 | -0/+0 |
| | |\ | |||||
| | | * | adapted tests for usage of the username | secustor | 2016-10-01 | 5 | -20/+20 |
| | | * | Changed Slack service user referencing from full name to username | secustor | 2016-09-30 | 5 | -4/+5 |
| | * | | adapted tests for usage of the username | secustor | 2016-10-02 | 5 | -20/+20 |
| | * | | Changed Slack service user referencing from full name to username | secustor | 2016-10-02 | 5 | -4/+5 |
| * | | | Changed Slack service user referencing from full name to username | secustor | 2016-10-03 | 10 | -24/+25 |
* | | | | Merge branch 'add-email-subject-suffix' into 'master' | Rémy Coutable | 2016-10-03 | 9 | -11/+36 |
|\ \ \ \ | |||||
| * | | | | resolve duplicated changelog entry | Fu Xu | 2016-10-03 | 1 | -1/+0 |
| * | | | | credit myself :smile: | Fu Xu | 2016-10-03 | 1 | -0/+1 |
| * | | | | change determine conditions | Fu Xu | 2016-10-03 | 2 | -2/+2 |
| * | | | | override subject method in devise mailer | Fu Xu | 2016-10-03 | 2 | -1/+10 |
| * | | | | follow the styleguide: Don't use parentheses around a literal | Fu Xu | 2016-10-03 | 1 | -1/+1 |
| * | | | | wrap subject with method subject | Fu Xu | 2016-10-03 | 1 | -1/+1 |
| * | | | | move spec back into shared example `an email sent from GitLab` | Fu Xu | 2016-10-03 | 2 | -7/+10 |
| * | | | | stub config settings in spec | Fu Xu | 2016-10-03 | 1 | -5/+2 |
| * | | | | remove empty line at block body end | Fu Xu | 2016-10-03 | 1 | -1/+0 |
| * | | | | remove extra entry | Fu Xu | 2016-10-03 | 1 | -3/+0 |
| * | | | | create new test in `spec/mailers/notify_spec.rb` | Fu Xu | 2016-10-03 | 2 | -4/+11 |
| * | | | | move changelog to 8.13 | Fu Xu | 2016-10-03 | 1 | -1/+1 |
| * | | | | add configurable email subject suffix | Fu Xu | 2016-10-03 | 6 | -9/+22 |
* | | | | | Merge branch 'aiionx_sidekiq_log_patch' into 'master' | Rémy Coutable | 2016-10-03 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | aiionx_sidekiq_log_patch | David | 2016-04-15 | 1 | -1/+1 |
* | | | | | | Merge branch '22466-task-list-fork' into 'master' | Rémy Coutable | 2016-10-03 | 4 | -52/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove the task_list test since it is patched upstream | Jared Deckard | 2016-09-30 | 1 | -16/+0 |
| * | | | | | | Align gem version strings | Jared Deckard | 2016-09-30 | 1 | -10/+10 |
| * | | | | | | Replace talk_list patch with a patched fork | Jared Deckard | 2016-09-30 | 3 | -26/+6 |
* | | | | | | | Merge branch 'zj-grape-award-emoji' into 'master' | Robert Speicher | 2016-10-03 | 1 | -33/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | GrapeDSL for Award Emoji endpointszj-grape-award-emoji | Z.J. van de Weg | 2016-10-03 | 1 | -33/+31 |
* | | | | | | | | Merge branch 'fix/import-export-admin' into 'master' | Robert Speicher | 2016-10-03 | 6 | -9/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Enable import/export back for non-adminsfix/import-export-admin | James Lopez | 2016-10-03 | 6 | -9/+7 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'use-custom-ruby-images' into 'master' | Rémy Coutable | 2016-10-03 | 3 | -19/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move the images over to dev.gitlab.orguse-custom-ruby-images | Z.J. van de Weg | 2016-09-30 | 2 | -3/+3 |
| * | | | | | | | | Update CI yaml and update CHANGELOG entry | Z.J. van de Weg | 2016-09-30 | 2 | -3/+3 |
| * | | | | | | | | Set CHANGELOG item to right release | Z.J. van de Weg | 2016-09-30 | 1 | -1/+1 |
| * | | | | | | | | remove unused cache from .gitlab-ci.yml | Z.J. van de Weg | 2016-09-30 | 1 | -2/+0 |
| * | | | | | | | | Use custom Ruby images to test builds | Kamil Trzcinski | 2016-09-30 | 3 | -17/+3 |
* | | | | | | | | | Merge branch 'group-empty-state' into 'master' | Jacob Schatz | 2016-10-03 | 5 | -6/+52 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Updated artwork of empty group state.group-empty-state | Fatih Acet | 2016-10-03 | 1 | -1/+1 |
| * | | | | | | | | | Better empty state for Groups view. | Fatih Acet | 2016-10-03 | 5 | -6/+52 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'rs-convert-ssh-key-features' into 'master' | Robert Speicher | 2016-10-03 | 3 | -70/+43 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Convert "SSH Keys" Spinach features to RSpecrs-convert-ssh-key-features | Robert Speicher | 2016-10-03 | 3 | -70/+43 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'zj-grape-keys' into 'master' | Rémy Coutable | 2016-10-03 | 1 | -4/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | GrapeDSL for Keys endpointzj-grape-keys | Z.J. van de Weg | 2016-10-01 | 1 | -4/+3 |
* | | | | | | | | | | Merge branch 'update-gitlab-shell-3-6-3' into 'master' | Rémy Coutable | 2016-10-03 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update gitlab-shell to 3.6.3 | Rémy Coutable | 2016-10-03 | 2 | -2/+2 |
| | |/ / / / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-sidebar' into 'master' | Dmitriy Zaporozhets | 2016-10-03 | 3 | -9/+9 |
|\ \ \ \ \ \ \ \ \ \ |