summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'add_autocomplete_for_labels' into 'master' Robert Speicher2016-06-171-0/+1
|\ | | | | | | | | | | | | Add GFM autocomplete for labels Closes #14637 See merge request !4013
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-06-1460-224/+810
| |\ | | | | | | | | | | | | | | | | | | add_autocomplete_for_labels # Conflicts: # app/assets/javascripts/gfm_auto_complete.js.coffee
| * | add gfm autocomplete for labelsArinde Eniola2016-05-031-0/+1
| | |
* | | Rename ci_commit to pipeline18131-pressing-merge-when-build-succeeds-at-the-same-exact-time-that-a-build-is-failing-will-merge-the-failed-buildZ.J. van de Weg2016-06-151-5/+5
| | |
* | | Fix race condition on auto mergeZeger-Jan van de Weg2016-06-151-3/+12
| | |
* | | Merge branch '18225-avoid-full-table-users-count' into 'master' Jacob Vosmaer (GitLab)2016-06-151-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the Users table has exactly one user limiting the whole set ## What does this MR do? Limit the query set so about a full scan for all the rows on the users table (only scan to records) #18225 See merge request !4492
| * | | Check if the Users table has exactly one user limiting the whole set18225-avoid-full-table-users-countPaco Guzman2016-06-061-1/+1
| | | |
* | | | Merge branch 'environments-and-deployments' into 'master' Rémy Coutable2016-06-154-3/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add environments and deployments This MR is a continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/17009. The current implementation is as follow: 1. We have two new tables: `environments` and `deployments`. 2. We have a new tab: `Environments` under `Pipelines` where you can see all you environments and add a new one. 3. We add a new option to `.gitlab-ci.yml` to track where we should create a deployment for environment. 4. If environment in `.gitlab-ci.yml` is specified it will create a deployment. **If environment does not exist it will be created.** (this got changed) 5. The deployment is always successful and shows the time of the action, in that case a build that presumably should do deployment. In the future we could extend deployment with statuses: success, failure. We could extend deployments with information that this is partial or full deployment. 6. User have to create environments that he will track first. 7. User can remove environments. 8. User can retry/rollback past deployment (in that case we retry past build). The new build when succeeds it will create a new deployment. 9. Currently environment have only one parameter: `name`. In the future it should have: `variables`, `credentials` and possibly `runners` and maybe other resources. 10. Currently deployment have this parameters: `sha`, `ref`, `deployable (in this case a build)`, `user (who triggered a deployment)`, `created_at`. The `.gitlab-ci.yml`: ``` deploy to production: stage: deploy script: dpl travis... environment: production ``` What needs to be done: - [x] Write initial implementation - [x] Improve implementation (@ayufan) - [x] Write tests (@ayufan) - [x] Improve UX of the forms (cc @markpundsack) - reviewed by @markpundsack - [x] Improve implementation of the views (cc @jschatz1) - done by @iamphill - [x] Write .gitlab-ci.yml documentation for `environments` - done by @ayufan - [ ] Write user documentation (@ayufan and @markpundsack) See merge request !4605
| * | | | Improve forms and specsKamil Trzcinski2016-06-151-2/+2
| | | | |
| * | | | Improve design after reviewKamil Trzcinski2016-06-141-8/+9
| | | | |
| * | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-141-6/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | Authorize environments controller actionsKamil Trzcinski2016-06-141-0/+2
| | | | | |
| * | | | | Make retry action on pipeline to save a userKamil Trzcinski2016-06-141-1/+1
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/master' into environments-and-deploymentsKamil Trzcinski2016-06-143-7/+20
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Add deployment viewsKamil Trzcinski2016-06-111-1/+28
| | | | | |
| * | | | | Added initial version of deploymentsKamil Trzcinski2016-06-103-8/+10
| | | | | |
| * | | | | commit statusKamil Trzcinski2016-06-101-0/+17
| | | | | |
* | | | | | Merge branch 'project-move-dropdown-search' into 'master' Jacob Schatz2016-06-151-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with move dropdown not being searchable ## What does this MR do? Adds the ability to search the project move dropdown. ## What are the relevant issue numbers? Closes #18634 ## Screenshots (if relevant) ![search](/uploads/f10a9a16b608308c1b3c66f186f57f80/search.gif) See merge request !4666
| * | | | | | Fixed issue with move dropdown not being searchableproject-move-dropdown-searchPhil Hughes2016-06-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #18634
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-154-41/+113
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'manual-todos-issuable-sidebar' into 'master' Stan Hu2016-06-141-0/+31
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually create todo for issuable ## What does this MR do? Adds a button to the sidebar in issues & merge requests to allow users to manually create a todo item themselves. ## What are the relevant issue numbers? Closes #15045 ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_09.52.14](/uploads/00af70244c0589d19f241c3e85f3d63d/Screen_Shot_2016-06-07_at_09.52.14.png) ![Screen_Shot_2016-06-07_at_09.52.06](/uploads/e232b02208613a4a50cff4d1e6f119ff/Screen_Shot_2016-06-07_at_09.52.06.png) ![Screen_Shot_2016-06-07_at_09.51.14](/uploads/f1d36435d49ab882538ae2252bec8086/Screen_Shot_2016-06-07_at_09.51.14.png) See merge request !4502
| | * | | | | | Returns created todos to control rather than re-queryPhil Hughes2016-06-141-2/+2
| | | | | | | |
| | * | | | | | Uses update URL to update the status of a todoPhil Hughes2016-06-141-9/+12
| | | | | | | |
| | * | | | | | Moved todo creation over to project todos controllerPhil Hughes2016-06-143-28/+28
| | | | | | | |
| | * | | | | | Manually create todo for issuablePhil Hughes2016-06-142-0/+28
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a button into the sidebar for issues & merge requests to allow users to manually create todo items Closes #15045
| * | | | | | Merge branch 'master' into 13948-access-request-to-projects-and-groupsDouwe Maan2016-06-141-6/+11
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/nav/_project.html.haml
| * | | | | | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-144-111/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Factorize access request routes into a new :access_requestable route concernRémy Coutable2016-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Factorize #request_access and #approve_access_request into a new ↵Rémy Coutable2016-06-143-31/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AccessRequestActions controller concern Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Add request access for groupsRémy Coutable2016-06-142-29/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | Initial implementation of user access request to projectsDavid Alexander2016-06-141-2/+29
| | |/ / / / | |/| | | |
* | | | | | Merge branch '17298-wiki-xss' into 'master' Robert Speicher2016-06-141-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forbid scripting for wiki files Wiki files (not pages - files in the repo) are just sent to the browser with whatever content-type the mime_types gem assigns to them based on their extension. As this is from the same domain as the GitLab application, this is an XSS vulnerability. Set a CSP forbidding all sources for scripting, CSS, XHR, etc. on these files. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17298. See merge request !1969
| * | | | | Forbid scripting for wiki filesSean McGivern2016-06-141-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wiki files (not pages - files in the repo) are just sent to the browser with whatever content-type the mime_types gem assigns to them based on their extension. As this is from the same domain as the GitLab application, this is an XSS vulnerability. Set a CSP forbidding all sources for scripting, CSS, XHR, etc. on these files.
* | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-142-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-132-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Gitlab::Auth method names Auth.find was a very generic name for a very specific method. Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also looks in Kerberos. See merge request !4589
| | * | | | Improve Gitlab::Auth method namesJacob Vosmaer2016-06-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auth.find was a very generic name for a very specific method. Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also looks in Kerberos.
* | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-131-5/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-131-5/+18
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove notification level from user model part of #3359 See merge request !4494
| | * | | | Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-101-8/+5
| | | | | |
| | * | | | Remove notification level from user modelFelipe Artur2016-06-101-4/+20
| | | | | |
* | | | | | Test controllers if they allow to keep artifactsKamil Trzcinski2016-06-131-0/+1
| | | | | |
* | | | | | Remove keep_artifacts from BuildsControllerKamil Trzcinski2016-06-131-6/+0
| | | | | |
* | | | | | Validate existence of artifacts in ArtifactsController, render 404 if not foundKamil Trzcinski2016-06-131-6/+5
| | | | | |
* | | | | | Move keep to ArtifactsControllerKamil Trzcinski2016-06-131-0/+5
| | | | | |
* | | | | | Allow to expire build artifactsKamil Trzcinski2016-06-131-0/+6
|/ / / / /
* | | | | Merge branch 'workhorse-helpers' into 'master' Robert Speicher2016-06-105-15/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add workhorse controller and API helpers Adds `send_git_blob` and `send_git_archive` controller and API helpers to reduce duplication and make Workhorse easier for a developer to work with. See merge request !4486
| * \ \ \ \ Merge branch 'master' into workhorse-helpersDouwe Maan2016-06-106-42/+153
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Add send_git_diff helperDouwe Maan2016-06-088-29/+70
| |\ \ \ \ \
| * | | | | | Add workhorse controller and API helpersDouwe Maan2016-06-064-10/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ci-page-ui-update' into 'master' Jacob Schatz2016-06-101-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI build page UI update Closes #2569 See merge request !3829
View Lorry Controller Status