| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Use `empty_project` where possible in controller specsrs-empty_project-controllers | Robert Speicher | 2017-01-25 | 43 | -74/+67 |
| | | |||||
| * | Merge branch 'dont-persist-application-settings-in-test-env-bis' into 'master' | Robert Speicher | 2017-01-24 | 1 | -0/+6 |
| |\ | | | | | | | | | Dont persist application settings in test env See merge request !8715 | ||||
| | * | Revert "Merge branch 'revert-9cac0317' into 'master' " | Grzegorz Bizon | 2017-01-23 | 1 | -0/+6 |
| | | | | | | | | | | | This reverts commit c20934869f7dc8cfbdbafb6ecb7b1305452c9e8a, reversing changes made to 4b7ec44b91e0571d209c790d54947ba1756dac0e. | ||||
| * | | Merge branch '22974-trigger-service-events-through-api' into 'master' | Douwe Maan | 2017-01-23 | 1 | -0/+1 |
| |\ \ | |/ |/| | | | | | | | | | adds events to services api deserialization Closes #22974 See merge request !8324 | ||||
| | * | adds test suite22974-trigger-service-events-through-api | Tiago Botelho | 2017-01-22 | 1 | -0/+1 |
| | | | |||||
| * | | Revert "Merge branch 'dont-persist-application-settings-in-test-env' into ↵ | Grzegorz Bizon | 2017-01-21 | 1 | -6/+0 |
| |/ | | | | | 'master'" This reverts merge request !8573 | ||||
| * | Merge branch 'dont-persist-application-settings-in-test-env' into 'master' | Robert Speicher | 2017-01-20 | 1 | -0/+6 |
| |\ | | | | | | | | | Don't persist application settings in test env See merge request !8573 | ||||
| | * | Don't persist ApplicationSetting in test envdont-persist-application-settings-in-test-env | Rémy Coutable | 2017-01-15 | 1 | -0/+6 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' | Rémy Coutable | 2017-01-20 | 1 | -0/+20 |
| |\ \ | | | | | | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380 | ||||
| | * | | Corrected code style and titles | Jose Ivan Vargas | 2017-01-18 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fixed more tests | Jose Ivan Vargas | 2017-01-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixed spinach feature tests for the services and hooks controllers | Jose Ivan Vargas | 2017-01-18 | 1 | -0/+20 |
| | | | | | | | | | | | | | Added a test for the integrations controller | ||||
| * | | | Merge branch '26117-sort-pipeline-for-commit' into 'master' | Kamil Trzciński | 2017-01-19 | 1 | -3/+35 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add sorting pipelines for a commit Closes #26117 See merge request !8319 | ||||
| | * | | | Add sorting pipeline for a commit | Takuya Noguchi | 2017-01-19 | 1 | -3/+35 |
| | | | | | |||||
| * | | | | Merge branch 'zj-fix-admin-templates' into 'master' | Kamil Trzciński | 2017-01-19 | 1 | -0/+26 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Fix Slash command templates Closes #26042 See merge request !8320 | ||||
| | * | | | Add tests for admin service templateszj-fix-admin-templates | Z.J. van de Weg | 2017-01-06 | 1 | -0/+26 |
| | | | | | |||||
| * | | | | Merge branch 'backport-time-tracking-ce' into 'master' | Douwe Maan | 2017-01-18 | 1 | -16/+32 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Backport timetracking to CE See merge request !8195 | ||||
| | * | | | | Backport backend work for time tracking. | Ruben Davila | 2017-01-15 | 1 | -16/+32 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch 'i-#25814-500-error' into 'master' | Sean McGivern | 2017-01-18 | 1 | -0/+30 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Compare page throws 500 error when any branch/reference is not selected Closes #25814 See merge request !8523 | ||||
| | * \ \ \ | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-16 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * | | | | | Added specs for the preservation of the from/to parameter | Martin Cabrera | 2017-01-15 | 1 | -1/+21 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-15 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | | Added specs for branches compare when from & to are empty | Martin Cabrera | 2017-01-10 | 1 | -0/+10 |
| | | | | | | | |||||
| * | | | | | | Merge branch '24915_merge_slash_command' into 'master' | Sean McGivern | 2017-01-17 | 2 | -0/+116 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support `/merge` slash command for MRs Closes #24915 See merge request !7746 | ||||
| | * | | | | | Address MR comments | Jarka Kadlecova | 2017-01-13 | 1 | -3/+19 |
| | | | | | | | |||||
| | * | | | | | refresh merge widget after using /merge command | Jarka Kadlecova | 2017-01-11 | 1 | -0/+52 |
| | | | | | | | |||||
| | * | | | | | support `/merge` slash comand for MRs | Jarka Kadlecova | 2017-01-11 | 1 | -0/+48 |
| | |/ / / / | |||||
| * | | | | | Fix to display notice when project settings updated. | sandish chen | 2017-01-15 | 1 | -1/+1 |
| | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change validity checking for UpdateService. Add return value for project update service. Return 302(redirect_to) when successfully updated. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | fixes the issue | Tiago Botelho | 2017-01-12 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge branch 'master' into auto-pipelines-vue | Regis | 2017-01-09 | 3 | -10/+24 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' | Alfredo Sumaran | 2017-01-06 | 3 | -10/+24 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Moved the members and groups to single option called members Closes #25985 See merge request !8281 | ||||
| | | * | | Fixed tests | Jose Ivan Vargas | 2017-01-03 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Added tests for the MembersController and corrected some more tests | Jose Ivan Vargas | 2017-01-03 | 1 | -0/+14 |
| | | | | | |||||
| | | * | | Removed the "Groups" option from the settings gear | Jose Ivan Vargas | 2017-01-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | Fixed more tests | ||||
| | | * | | Fixed rspec tests for the project members also fixed the index | Jose Ivan Vargas | 2017-01-03 | 1 | -7/+7 |
| | | |/ | | | | | | | | | | view (removed an extra tag ) | ||||
| * | | | Merge branch 'master' into auto-pipelines-vue | Regis | 2017-01-04 | 1 | -15/+45 |
| |\ \ \ | |/ / | |||||
| | * | | Properly handle failed reCAPTCHA on user registration | Drew Blessing | 2017-01-03 | 1 | -15/+45 |
| | |/ | | | | | | | | | | | | | | | If a user presses the 'Register' button too quickly after attempting to solve the reCAPTCHA, or the reCAPTCHA is not solved at all, the user would experience a 500 error. Now, the case is properly handled and the user will be sent back to the registration page with a clear error message and can try again. | ||||
| * | | fix pipelines/index.html.haml merge conflict | Regis | 2017-01-02 | 5 | -3/+140 |
| |\ \ | |/ | |||||
| | * | Fix redirect after update file when user has forked project | Felipe Artur | 2016-12-29 | 1 | -1/+31 |
| | | | |||||
| | * | applies url_for so that we dont lose filters when redirecting19988-prevent-empty-pagination-when-list-not-empty | Tiago Botelho | 2016-12-23 | 4 | -8/+10 |
| | | | |||||
| | * | adds specs for respective behaviour | Tiago Botelho | 2016-12-21 | 4 | -2/+107 |
| | | | |||||
| * | | merge master and fix application.rb conflict | Regis | 2016-12-23 | 3 | -4/+79 |
| |\ \ | |/ | |||||
| | * | Merge branch '23638-remove-builds-tab' into 'master' | Kamil Trzciński | 2016-12-21 | 1 | -4/+0 |
| | |\ | | | | | | | | | | | | | | | | | | | Resolve "Remove Builds tab from Merge Requests and Commits" Closes #23638 See merge request !7763 | ||||
| | | * | Removes builds tab from merge request | Filipa Lacerda | 2016-12-21 | 1 | -4/+0 |
| | | | | | | | | | | | | | Fix specs | ||||
| | * | | Merge branch 'zj-mattermost-slash-config' into 'master' | Kamil Trzciński | 2016-12-21 | 1 | -0/+58 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Mattermost slash auto config Closes #24769 See merge request !8070 | ||||
| | | * | | Add new tests | Z.J. van de Weg | 2016-12-21 | 1 | -1/+6 |
| | | | | | |||||
| | | * | | Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce ↵ | Kamil Trzcinski | 2016-12-20 | 1 | -0/+53 |
| | | |\ \ | | | | | | | | | | | | | | | | into zj-mattermost-slash-config | ||||
| | | | * | | Add controller test | Z.J. van de Weg | 2016-12-20 | 1 | -0/+53 |
| | | | | | | |||||
| | * | | | | Merge branch 'fix/group-path-rename-error' into 'master' | Douwe Maan | 2016-12-21 | 1 | -0/+21 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | Fix error 500 renaming group. Also added specs and changelog. Closes #17922 and #23223 See merge request !8201 | ||||
| | | * | | | added more specs | James Lopez | 2016-12-21 | 1 | -2/+2 |
| | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |