summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Use present? instead of presence on Projects::IssuesController#indexDouglas Barbosa Alexandre2016-10-191-1/+1
| | |
| * | Render all available labels to project on project labels dropdownDouglas Barbosa Alexandre2016-10-191-1/+1
| | |
| * | Limit what label fields we expose on Projects::LabelsController#indexDouglas Barbosa Alexandre2016-10-191-1/+1
| | |
| * | Use present? instead of presence on Projects::MergeRequestsControllerDouglas Barbosa Alexandre2016-10-191-1/+4
| | |
| * | Remove scopes/types for labelsDouglas Barbosa Alexandre2016-10-191-9/+10
| | |
| * | Avoid an extra a query per label when setting label priorityDouglas Barbosa Alexandre2016-10-191-2/+3
| | |
| * | Remove project_labels from Projects::ApplicationControllerDouglas Barbosa Alexandre2016-10-194-22/+17
| | |
| * | List group labels on project labels pageDouglas Barbosa Alexandre2016-10-194-6/+15
| | |
| * | Allow user to create a board list based on a group labelDouglas Barbosa Alexandre2016-10-191-1/+4
| | |
| * | Allow users to apply group labels on Issues/MRsDouglas Barbosa Alexandre2016-10-193-5/+11
| | |
| * | Merge branch '21444-pipeliens-new-mr' into 'master' Fatih Acet2016-10-191-6/+13
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pipelines tab to new MR #### What does this MR do? Adds pipelines tab to new MRs #### Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_10.23.27_AM](/uploads/6c3f8f2be0cf9ba7cc78f6d918307ec0/Screen_Shot_2016-10-10_at_10.23.27_AM.png) ![Screen_Shot_2016-10-11_at_8.59.45_AM](/uploads/e67577d92327eafef6f04073f3d94212/Screen_Shot_2016-10-11_at_8.59.45_AM.png) #### What are the relevant issue numbers? Closes #21444 See merge request !6238
| | * Extract pipeline vars in merge requests controllerGrzegorz Bizon2016-10-181-5/+13
| | |
| | * Use all pipelines variable when creating merge requestGrzegorz Bizon2016-10-181-2/+2
| | |
| | * Remove obsolete variable assigned to MR widget viewGrzegorz Bizon2016-10-181-1/+0
| | |
| * | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-192-10/+21
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete dynamic environments - Adds "close environment" action to a merge request - Adds tabs to environments list - Adds close button to each environment row in environments list - Replaces Destroy button with Close button inside an environment - Adds close button to builds list inside an environment #### Configuration In order to enable stopping environments a valid `.gitlab-ci.yml` syntax has to be used: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App when: manual environment: name: review/$app action: stop ``` This MR requires that `stop_review` has to have: `when`, `environment:name` and `environment:action` defined. The next MR after this one will verify that and enforce that these settings are configured. It will also implicitly configure these settings, making it possible to define it like this: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App ``` Closes #22191 See merge request !6669
| | * | Add logical validation to gitlab-ci.ymlKamil Trzcinski2016-10-181-1/+1
| | | |
| | * | Add `stop!` to `environment`Kamil Trzcinski2016-10-181-4/+7
| | | |
| | * | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-5/+15
| | |\ \ | | | |/
| | * | Fix remaining specs failuresKamil Trzcinski2016-10-181-1/+6
| | | |
| | * | Fix specsKamil Trzcinski2016-10-171-1/+1
| | | |
| | * | Fix environments specsKamil Trzcinski2016-10-171-2/+3
| | | |
| | * | Improve after code reviewKamil Trzcinski2016-10-171-6/+5
| | | |
| | * | Remove destroy from environments [ci skip]Kamil Trzcinski2016-10-171-13/+3
| | | |
| | * | Refactor code to use available and stopped statuses and refactor views to ↵Kamil Trzcinski2016-10-172-4/+6
| | | | | | | | | | | | | | | | use separate renders
| | * | Add environment stop action [ci skip]Kamil Trzcinski2016-10-172-1/+6
| | | |
| | * | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1710-129/+202
| | |\ \
| | * | | Make environments to be close ableKamil Trzcinski2016-10-061-5/+6
| | | | |
| | * | | Adds variables to controllerFilipa Lacerda2016-10-061-0/+5
| | | | |
* | | | | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-1910-108/+147
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-181-5/+15
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (58 commits) Update endpoint to username validator change border color to variable Add todo for deprecated user routes and more information about deprecation to changelog Provide better error message to the user Apply better hierarchy to markdown headers and issue/mr titles Swapped button text manipulation outcomes for the toggle query Fixed find file keyboard navigation Update CHANGELOG for 8.12.7 Added download-button class and applied button margin Enable activerecord_sane_schema_dumper for test Updated logo from @luke Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896 Fix Test Env (proper error handling when gitlab-shell is not clonned) Fix randomly crashing spinach test for merge request [Great spinach fix] Replace gsub with delete Remove carriage returns from commit description as summary is on a newline and will always include carriage returns Convert due_date_select.js filetype to es6. Stop directly parsing due_date with Date.parse, prefer parsing implicitly. Improve spec for pipeline metrics worker Add Pipeline metrics worker ...
| | * | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-173-18/+64
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Allow setting content for resolutionsSean McGivern2016-10-131-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When reading conflicts: 1. Add a `type` field. `text` works as before, and has `sections`; `text-editor` is a file with ambiguous conflict markers that can only be resolved in an editor. 2. Add a `content_path` field pointing to a JSON representation of the file's content for a single file. 3. Hitting `content_path` returns a similar datastructure to the `file`, but without the `content_path` and `sections` fields, and with a `content` field containing the full contents of the file (with conflict markers). When writing conflicts: 1. Instead of `sections` being at the top level, they are now in a `files` array. This matches the read format better. 2. The `files` array contains file hashes, each of which must contain: a. `new_path` b. `old_path` c. EITHER `sections` (which works as before) or `content` (with the full content of the resolved file).
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-172-17/+39
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (148 commits) Fix broken rspec in compare text Added logic to handle a revision input that does not exist in the menu Fix broken Spinach tests caused by changes in !6550 Convert CHANGELOG to Markdown Fix active tab test for branches page Fix merge requests feature tests Wait for ajax call in merge request unsubscribe test Fix 500 error when creating mileston from group page Fix 404 when group path has dot in the name Add the tech writers usernames in the doc_sytleguide doc Fix broken SCSS linter errors due to missing newlines Fix Hash syntax to work for both Ruby 2.1 and 2.3 Fix Spinach merge request diff failures remove ashley since she no longer works here Revert "Improve tabbing usability for sign in page" Don't use member properties in users_spec, and remove loading ref. Clean up stray Sign up ref. Back off the array spreading, bc poltergeist freaks out. Convert dispatcher to es6. Add exists to users routes and fix endpoint. ...
| | * | | Merge branch 'members-ui' into 'master' Fatih Acet2016-10-142-17/+39
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project members UI ## What does this MR do? New UI for project members that includes groups. ## Screenshots (if relevant) ### Project members ![Screen_Shot_2016-09-02_at_15.13.27](/uploads/b9d4a634d44b7b7bbb6eddb10aee86bd/Screen_Shot_2016-09-02_at_15.13.27.png) ### Group members ![Screen_Shot_2016-09-02_at_15.13.36](/uploads/c15c173e68b2c0b49bcd06ca560269d3/Screen_Shot_2016-09-02_at_15.13.36.png) ## What are the relevant issue numbers? Part of #19868 Closes #21320 See merge request !6148
| | | * | | Changed how collections are renderedPhil Hughes2016-10-061-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used variables in haml for replicated checks Fixed broken conflict
| | | * | | Merge branch 'master' into members-uiPhil Hughes2016-10-065-37/+71
| | | |\ \ \
| | | * | | | Updated Ruby variable namePhil Hughes2016-10-051-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Ruby code based on review feedback
| | | * | | | Updated RubyPhil Hughes2016-10-042-3/+4
| | | | | | |
| | | * | | | Merge branch 'master' into members-uiPhil Hughes2016-10-0410-62/+149
| | | |\ \ \ \
| | | * | | | | Group links search test fixPhil Hughes2016-09-131-0/+4
| | | | | | | |
| | | * | | | | Added back orderingPhil Hughes2016-09-131-0/+1
| | | | | | | |
| | | * | | | | Ruby updatePhil Hughes2016-09-131-7/+7
| | | | | | | |
| | | * | | | | Removed group members from the list for nowPhil Hughes2016-09-131-25/+0
| | | | | | | |
| | | * | | | | Fixed bug when group_ids not present when creatingPhil Hughes2016-09-131-9/+11
| | | | | | | |
| | | * | | | | Search project groupsPhil Hughes2016-09-131-8/+41
| | | | | | | |
| | | * | | | | Fixed removing groupsPhil Hughes2016-09-131-1/+6
| | | | | | | |
| | | * | | | | Added test for updating groups permissionsPhil Hughes2016-09-131-1/+1
| | | | | | | |
| | | * | | | | Fixed error when updating groupsPhil Hughes2016-09-131-1/+1
| | | | | | | |
| | | * | | | | Updated some specsPhil Hughes2016-09-131-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with group name not showing
| | | * | | | | Fixed searchPhil Hughes2016-09-131-6/+15
| | | | | | | |
View Lorry Controller Status