Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | pass username and id associations needed in the frontend26955-handle-legacy-issue-filter-params | Mike Greiling | 2017-01-20 | 1 | -18/+12 |
| | |||||
* | automatically redirect urls containing author_id or assignee_id | Mike Greiling | 2017-01-20 | 1 | -0/+18 |
| | |||||
* | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' | Rémy Coutable | 2017-01-20 | 3 | -14/+22 |
|\ | | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380 | ||||
| * | Fixed tests and a rubocop linter26138-combine-webhooks-and-services-settings-pages | Jose Ivan Vargas | 2017-01-18 | 1 | -4/+2 |
| | | |||||
| * | Removed the index action from both the projects hook and services controllers | Jose Ivan Vargas | 2017-01-18 | 2 | -9/+2 |
| | | |||||
| * | Corrected code style and titles | Jose Ivan Vargas | 2017-01-18 | 1 | -1/+1 |
| | | |||||
| * | Moved the webhooks and services gear options to a single one called integrations | Jose Ivan Vargas | 2017-01-18 | 3 | -5/+22 |
| | | |||||
* | | Merge branch '23563-document-presenters' into 'master' | Dmitriy Zaporozhets | 2017-01-19 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Document presenters Closes #23563 See merge request !8480 | ||||
| * | | More improvements to presenters23563-document-presenters | Rémy Coutable | 2017-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Add Presentable concern | Rémy Coutable | 2017-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Merge branch '26117-sort-pipeline-for-commit' into 'master' | Kamil Trzciński | 2017-01-19 | 1 | -5/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add sorting pipelines for a commit Closes #26117 See merge request !8319 | ||||
| * | | | Add sorting pipeline for a commit | Takuya Noguchi | 2017-01-19 | 1 | -5/+0 |
| | | | | |||||
* | | | | Merge branch 'speed-up-dashboard-milestone-index' into 'master' | Sean McGivern | 2017-01-19 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Speed up dashboard milestone index by scoping IssuesFinder to user authorized projects See merge request !8524 | ||||
| * | | | | Speed up dashboard milestone index by scoping IssuesFinder to user ↵speed-up-dashboard-milestone-index | Adam Niedzielski | 2017-01-16 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authorized projects It improves performance in dashboard milestone index page by passing a hint to "IssuesFinder". "IssuesFinder" generates a more performant query when it is limited to authorized projects for user. In the dashboard we already limit the projects to these authorized for user (see "Dashboard::ApplicationController#projects"), so we can safely pass this option to "IssuesFinder". | ||||
* | | | | | Merge branch 'current-user-filter-top' into 'master' | Sean McGivern | 2017-01-19 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Shows current user on top of filtered dropdown list Closes #26765 See merge request !8612 | ||||
| * | | | | Shows current user on top of filtered dropdown listcurrent-user-filter-top | Phil Hughes | 2017-01-17 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'fix/refactor-cycle-analytics-stages' into 'master' | Douwe Maan | 2017-01-18 | 3 | -64/+26 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Refactor cycle analytics stages (1st iteration) See merge request !7647 | ||||
| * | | | | refactor fetcher and fixed specs | James Lopez | 2017-01-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | refactor cycle analytics - updated based on MR feedback | James Lopez | 2017-01-17 | 2 | -10/+10 |
| | | | | | |||||
| * | | | | Fix other spec failures | James Lopez | 2017-01-17 | 3 | -17/+17 |
| | | | | | |||||
| * | | | | more refactoring and fixing old specs | James Lopez | 2017-01-17 | 3 | -7/+9 |
| | | | | | |||||
| * | | | | added new summary serializers and refactor all of the summary stuff into ↵ | James Lopez | 2017-01-17 | 1 | -45/+5 |
| |/ / / | | | | | | | | | | | | | separate logical classes | ||||
* | | | | Merge branch 'i-#25814-500-error' into 'master' | Sean McGivern | 2017-01-18 | 1 | -1/+10 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Compare page throws 500 error when any branch/reference is not selected Closes #25814 See merge request !8523 | ||||
| * | | | | refactor rubocop suggestion | Martin Cabrera | 2017-01-16 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-16 | 1 | -7/+4 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Refactored ‘from’ and ‘to’ variable preservation | Martin Cabrera | 2017-01-16 | 1 | -10/+6 |
| | | | | | |||||
| * | | | | from or to get variables gets preserved if the other one is missing | Martin Cabrera | 2017-01-15 | 1 | -2/+9 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-15 | 3 | -25/+66 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Changed alert message character: from & to and | Martin Cabrera | 2017-01-15 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i-#25814-500-error | Martin Cabrera | 2017-01-12 | 3 | -56/+92 |
| |\ \ \ \ | |||||
| * | | | | | Fix Compare page throws 500 error when any branch/reference is not selected | Martin Cabrera | 2017-01-10 | 1 | -1/+6 |
| | | | | | | |||||
* | | | | | | Merge branch '24915_merge_slash_command' into 'master' | Sean McGivern | 2017-01-17 | 2 | -1/+12 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support `/merge` slash command for MRs Closes #24915 See merge request !7746 | ||||
| * | | | | | Address MR comments | Jarka Kadlecova | 2017-01-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | refresh merge widget after using /merge command | Jarka Kadlecova | 2017-01-11 | 1 | -0/+10 |
| | | | | | | |||||
| * | | | | | support `/merge` slash comand for MRs | Jarka Kadlecova | 2017-01-11 | 1 | -1/+2 |
| |/ / / / | |||||
* | | | | | Add a spec and actually display the flash notice | Rémy Coutable | 2017-01-16 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | Fix to display notice when project settings updated. | sandish chen | 2017-01-15 | 1 | -2/+2 |
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
* | | | | Merge branch 'refactor-controller-params' into 'master' | Robert Speicher | 2017-01-12 | 2 | -21/+66 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Refactor controller params See merge request !8522 | ||||
| * | | | | Refactor authorized params in GroupsController | Rémy Coutable | 2017-01-12 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | Refactor allowed params in ServiceParams | Rémy Coutable | 2017-01-12 | 1 | -19/+60 |
| | |/ / | |/| | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch '24185-legacy-ci-status-reactive-cache' into 'security' | Robert Speicher | 2017-01-12 | 1 | -4/+0 |
|/ / / | | | | | | | | | | | | | | | | Use ReactiveCaching to update external CI status asynchronously See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2055 | ||||
* | | | Add support for PlantUML diagrams in Asciidoc. | Horacio Sanson | 2017-01-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR enables rendering of PlantUML diagrams in Asciidoc documents. To add a PlantUML diagram all we need is to include a plantuml block like: ``` [plantuml, id="myDiagram", width="100px", height="100px"] -- bob -> alice : ping alice -> bob : pong -- ``` The plantuml block is substituted by an HTML img element with *src* pointing to an external PlantUML server. This MR also add a PlantUML integration section to the Administrator -> Settings page to configure the PlantUML rendering service and to enable/disable it. Closes: #17603 | ||||
* | | | Refactor authorized params in Admin::UsersControllerrefactor-admin-controllers-params | Rémy Coutable | 2017-01-11 | 2 | -27/+32 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Refactor authorized params in Admin::GroupsController | Rémy Coutable | 2017-01-11 | 1 | -2/+6 |
| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | Refactor authorized params in Admin::ApplicationSettingsController | Rémy Coutable | 2017-01-11 | 1 | -45/+70 |
|/ / | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'master' into auto-pipelines-vue | Regis | 2017-01-09 | 6 | -76/+84 |
|\ \ | |/ | |||||
| * | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' | Alfredo Sumaran | 2017-01-06 | 3 | -52/+64 |
| |\ | | | | | | | | | | | | | | | | | | | Moved the members and groups to single option called members Closes #25985 See merge request !8281 | ||||
| | * | Updated the "users" to "members" matches in the view | Jose Ivan Vargas | 2017-01-03 | 1 | -3/+3 |
| | | | | | | | | | | | | Reverted the change from the "expires_at" to "expires_at_groups" in the groups controller | ||||
| | * | Removed the "Groups" option from the settings gear | Jose Ivan Vargas | 2017-01-03 | 1 | -2/+2 |
| | | | | | | | | | | | | Fixed more tests | ||||
| | * | Added groups to members section, added a members finder | Jose Ivan Vargas | 2017-01-03 | 2 | -10/+10 |
| | | |