summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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
| | | | | | | |
| | | * | | | | Fixed issue with invited users not showing upPhil Hughes2016-09-131-1/+13
| | | | | | | |
| | | * | | | | Fixed members errorPhil Hughes2016-09-131-1/+1
| | | | | | | |
| | | * | | | | Return 403 if user can't update groupPhil Hughes2016-09-131-0/+1
| | | | | | | |
| | | * | | | | Removes row from dom when deletingPhil Hughes2016-09-131-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed spacing with buttons Disables group form when user doesnt have correct permissions
| | | * | | | | Fixed group members not deletingPhil Hughes2016-09-131-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Combine both group members & project members in project members list
| | | * | | | | Fixed issue with groups not displayingPhil Hughes2016-09-131-14/+0
| | | | | | | |
| | | * | | | | Included groups on project_members pagePhil Hughes2016-09-132-0/+13
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-147-85/+90
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (237 commits) Grapify boards API Add test, fix merge error Use local assigns to get the dropdown title Updated issuable dropdown titles Added safety check for formatted values Minor style improvement Fixed conflict and corrected teaspoon test Rename method in test Moved ci_status environments logic to new action ci_envrionments_status and set up frontend polling Refactor ci_status on MergeRequestController Fix indenting error in HAML Show what time ago a MR was deployed Fixed missing links Fixed missing links Refactor merge requests revisions Add link to update docs for source installations Grapify todos API Link to review apps example from docs fix grafana_configuration.md move link Do not run before_script, artifacts, cache in trigger_docs job ...
| | * | | | | | Add test, fix merge errorzj-show-deployed-time-agoZ.J. van de Weg2016-10-141-1/+2
| | | | | | | |
| | * | | | | | Minor style improvementZ.J. van de Weg2016-10-141-14/+6
| | | | | | | |
| | * | | | | | Rename method in testZ.J. van de Weg2016-10-141-18/+23
| | | | | | | |
| | * | | | | | Moved ci_status environments logic to new action ci_envrionments_status and ↵Luke Bennett2016-10-141-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set up frontend polling
| | * | | | | | Refactor ci_status on MergeRequestControllerZ.J. van de Weg2016-10-141-25/+20
| | | | | | | |
| | * | | | | | Show what time ago a MR was deployedZ.J. van de Weg2016-10-141-1/+30
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'use-language-colours-for-graph' into 'master' Sean McGivern2016-10-131-3/+3
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use defined colour for a language when available ## What does this MR do? This MR changes the colours of the different languages in the language graph. It now uses the colour set in Linguist instead of the first six characters of the SHA256'd language name where possible. If Linguist has no colour defined for a given language, it falls back to the old method of finding a colour. I talked with @connorshea about creating this MR [on Twitter](https://twitter.com/connorjshea/status/784390886222286849) a few hours earlier. Here's also an older [tweet from May](https://twitter.com/nilsding/status/737018807223496708) where we discussed some possible improvements to the graph. ## Are there points in the code the reviewer needs to double check? Hopefully none ;) ## Why was this MR needed? Aesthetics. ## Screenshots (if relevant) Before: ![language_colours_before](/uploads/6b4bac784860da746d58708bdd6bba39/language_colours_before.png) After: ![language_colours_after](/uploads/98818ebf48ffb47e6b785120e69b0b6c/language_colours_after.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? - #12455 See merge request !6748
| | | * | | | | Use Linguist::Language[] instead of creating a hashGeorg G2016-10-101-5/+1
| | | | | | | |
| | | * | | | | Use defined colour for a language when availableGeorg G2016-10-071-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the colours of languages in the language graph to the ones Linguist has defined. When there is no colour defined for a language in Linguist, it will fall back to the old method of finding a colour.
| | * | | | | | Merge branch 'feature/issues-board' into 'master' Sean McGivern2016-10-134-81/+39
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring Issues Board ## What does this MR do? This MR aims to minimize conflicts between the CE issues board feature with EE multiple boards feature. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To avoid a lot of conflicts with EE multiple boards feature. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] ~~[CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~ - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [x] API support added - Tests - [X] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [X] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/929 https://gitlab.com/gitlab-org/gitlab-ee/issues/1084 See merge request !6727
| | | * | | | | | Fix board relates specsDouglas Barbosa Alexandre2016-10-111-1/+1
| | | | | | | | |
| | | * | | | | | Refactoring service to create a new issue in a board listDouglas Barbosa Alexandre2016-10-111-3/+2
| | | | | | | | |
| | | * | | | | | Remove unused Projects::BoardListsController controllerDouglas Barbosa Alexandre2016-10-111-65/+0
| | | | | | | | |
| | | * | | | | | Update endpoints to handle with board issuesDouglas Barbosa Alexandre2016-10-111-2/+2
| | | | | | | | |
| | | * | | | | | Update endpoints to handle with board list changesDouglas Barbosa Alexandre2016-10-111-7/+11
| | | | | | | | |
| | | * | | | | | Update Projects::BoardsController#show to look up for a specific boardDouglas Barbosa Alexandre2016-10-111-2/+13
| | | | | | | | |
| | | * | | | | | Add index action to Projects::BoardsController to return project boardsDouglas Barbosa Alexandre2016-10-111-3/+12
| | | |/ / / / /
| | * | | | | | Merge branch '22211-500-instead-of-404' into 'master' Sean McGivern2016-10-111-0/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Respond with 404 Not Found for non-existent tags ## What does this MR do? Handles the case when a non-existent tag is being viewed, and responds with 404 Not Found instead of 500 Internal Server Error. ## Are there points in the code the reviewer needs to double check? The small changes should be clear from a simple diff. ## Why was this MR needed? To resolve the issue #22211. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22211 See merge request !6699
| | | * \ \ \ \ \ Merge branch 'master' into 22211-500-instead-of-404Linus G Thiel2016-10-116-40/+102
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | * | | | | | Respond with 404 Not Found for non-existent tagsLinus G Thiel2016-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-existent tags should be handled with 404 Not Found.
| | | * | | | | | Respond with 404 Not Found for non-existent tagsLinus G Thiel2016-10-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Non-existent tags should be handled with 404 Not Found.