summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixes issue with signin button overflowing on mobileheader-mobile-overflowPhil Hughes2016-03-223-4/+13
| | | | Closes #14477
* Merge branch 'feature-ci-only-except-trigger' into 'master' Kamil Trzciński2016-03-224-10/+66
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI: Add 'triggers' keyword to 'only' and 'except' lists to allow control over when triggers cause builds to run Currently, the `only` and `except` keywords in `.gitlab-ci.yml` only accept ref names or the special `branches` and `tags` keywords. However, these are primarily useful when controlling how repository activity affects the creation of builds. In my case, instead of building on every commit, I'd like to use the following logic: - If the repository is tagged, do a build. - Any other normal commits should not cause a build. - If a build is triggered via the API, always create one for the specified ref. From what I can tell, this isn't possible via the existing YAML syntax. In this MR, I introduce a new keyword `triggers` that goes along with `branches` and `tags`. I can implement the logic above using the following job configuration: ```yaml only: - tags - triggers ``` I updated the tests and documentation to reflect this and everything seems to pass. See merge request !3230
| * make conditional a bit clearerJason Roehm2016-03-151-1/+1
| |
| * fixed missing argument in listJason Roehm2016-03-151-1/+1
| |
| * fix rubocop violationJason Roehm2016-03-151-1/+1
| |
| * add some documentation for `triggers` keyword [ci skip]Jason Roehm2016-03-151-1/+12
| |
| * add tests for only/except 'triggers' keywordJason Roehm2016-03-151-0/+44
| |
| * add 'triggers' keyword to gitlab-ci.yml 'only' and 'except' fields to allow ↵Jason Roehm2016-03-152-8/+9
| | | | | | | | control over whether triggers will cause jobs to run
* | Merge branch 'issue_12658' into 'master' Robert Speicher2016-03-221-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Check if index exists before adding it I got an error when updating GDK because it already exists. [ci skip] See merge request !3335
| * | Check if index exists before adding it. [ci skip]Rubén Dávila2016-03-211-1/+3
|/ / | | | | | | * I got an error when updating GDK because it already exists.
* | Merge branch 'issue_12658' into 'master' Robert Speicher2016-03-22101-977/+1538
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add group visibility level Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3051 Closes #12658 See merge request !3323
| * | Fix specsissue_12658Douwe Maan2016-03-223-11/+13
| | |
| * | Address feedbackDouwe Maan2016-03-2224-100/+154
| | |
| * | Merge branch 'master' into issue_12658Douwe Maan2016-03-21159-761/+2015
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
* | | Merge branch 'change_css_class_has_tooltip_to_has-tooltip' into 'master' Jacob Schatz2016-03-2134-47/+47
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | change the css class has_tooltip to has-tooltip universally closes #14432 See merge request !3321
| * | | change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltipArinde Eniola2016-03-2034-47/+47
| | | |
* | | | Merge branch 'css-indentation' into 'master' Jacob Schatz2016-03-213-9/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Indentation lints in CSS. As discussed in #14299. cc: @jschatz1 See merge request !3312
| * | | | Fix Indentation lints in CSS.connorshea2016-03-183-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in #14299. [ci skip]
* | | | | Merge branch 'ssh-page-ago' into 'master' Jacob Schatz2016-03-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicated ago Closes #14460 See merge request !3332
| * | | | | Remove duplicated agossh-page-agoRobert Schilling2016-03-211-1/+1
| | | | | |
* | | | | | Merge branch 'project-icon' into 'master' Jacob Schatz2016-03-213-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing project icon Closes #14196 See merge request !3268
| * | | | | | Updated other views with new project iconproject-iconPhil Hughes2016-03-212-2/+2
| | | | | | |
| * | | | | | Group page now uses correct project iconPhil Hughes2016-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14196
* | | | | | | Merge branch 'css-shorthand' into 'master' Jacob Schatz2016-03-2110-23/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the CSS Style Guide rules for using shorthand where possible. Fixes violations of the Shorthand rule. All of these were done manually and I reviewed each change to verify, so they should all be right. Discussed in #14299. cc: @jschatz1 See merge request !3313
| * | | | | | | Follow the CSS Style Guide rules for using shorthand where possible.connorshea2016-03-1810-23/+23
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes violations of Shorthand. Discussed in #14299. [ci skip]
* | | | | | | Merge branch '2489-soft-delete-issues' into 'master' Douwe Maan2016-03-2125-38/+231
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Soft delete issuables Fixes #2489 What still needs to happen: research on the indexes, the gem suggests a [lot of changes](https://github.com/rubysherpas/paranoia#about-indexes) though this is probably a good idea to discuss and I'm unsure on the impact of an omnibus upgrade as I suspect creating about 10 new indexes has a large impact on the downtime. TODO: - [x] Also group owners can ***soft*** delete - [x] Button should be hidden See merge request !2982
| * \ \ \ \ \ \ Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-21100-647/+1708
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Fix typos and dentingZeger-Jan van de Weg2016-03-214-12/+11
| | | | | | | |
| * | | | | | | Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-2117-165/+110
| | | | | | | |
| * | | | | | | Satisfy rubocopZeger-Jan van de Weg2016-03-192-4/+1
| | | | | | | |
| * | | | | | | minor improvements and fixed specsZeger-Jan van de Weg2016-03-196-29/+34
| | | | | | | |
| * | | | | | | Dry destroy action on issuablesZeger-Jan van de Weg2016-03-1915-43/+56
| | | | | | | |
| * | | | | | | Hide delete botton on edit pageZeger-Jan van de Weg2016-03-196-11/+9
| | | | | | | |
| * | | | | | | Soft delete issuablesZeger-Jan van de Weg2016-03-1920-18/+254
| | | | | | | |
* | | | | | | | Merge branch 'fix/safe-import-url' into 'master' Douwe Maan2016-03-212-0/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent tokens in the import URL to be showed by the UI Quick fix to prevent the import URL to show a user's token. See merge request !3331
| * | | | | | | updated changelogfix/safe-import-urlJames Lopez2016-03-211-0/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-21658-8791/+13482
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | fix/safe-import-url
* | | | | | | | Merge branch 'remove-console-log' into 'master' Jacob Schatz2016-03-211-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove console.log call See merge request !3322
| * | | | | | | | Remove console.log callStan Hu2016-03-201-1/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'issues-show-performance' into 'master' Robert Speicher2016-03-2113-23/+140
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of viewing individual issues This MR does two things: 1. `Issue#related_branches` no longer performs Git operations that aren't needed 2. The output of `Repository#exists?` is now cached and flushed properly Combined these two changes should further cut down the amount of Git operations performed when viewing individual issues (and possibly other pages). See merge request !3296
| * | | | | | | | | Create SSH keys for SSH clone Spinach testsissues-show-performanceYorick Peterse2016-03-212-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests would check if the "This project is empty" banner would contain SSH clone URLs. Oddly enough this should have never passed (as far as I can tell) as SSH clone URLs in this banner are _only_ displayed if the current user has at least 1 SSH key attached. Since the tests never seem to create any they never should have passed, yet somehow they did. To solve this the Spinach tests in question now ensure at least 1 SSH key is present.
| * | | | | | | | | Create repositories in Spinach issues testsYorick Peterse2016-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to ad90dba5185e30883d5ad6008c166b0df0108ebf we always have a repository in the real world, so let's also create one in our Spinach tests.
| * | | | | | | | | Create repositories in IssuesController specsYorick Peterse2016-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the real world a project always has a repository. This fact allows code such as Issue#related_branches to work without explicitly checking if a repository exists.
| * | | | | | | | | Cache output of Repository#exists?Yorick Peterse2016-03-198-15/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This caches the output of Repository#exists? in Redis while making sure it's flushed properly when creating new repositories, deleting them, etc. For the ProjectWiki tests to work I had to make ProjectWiki#create_repo! public as testing private methods in RSpec is a bit of a pain.
| * | | | | | | | | Tweaked performance of Issue#related_branchesYorick Peterse2016-03-192-5/+5
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requesting the branch names of a repository works even when it's empty, thus there's no need to explicitly check for an empty repository. Removing this check cuts down the amount of Git operations which in turn cuts down request timings a bit. The regular expression used to compare branches was also moved out of the loop so it's created only once.
* | | | | | | | | Merge branch 'feature/issue-move' into 'master' Kamil Trzciński2016-03-2130-15/+866
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ability to move issue to another project Tasks: - [x] Create scaffold of service that will move issue to another project. - [x] Close old issue, add system note about moving issue to a new project. - [x] Create a new issue, add system note about issue being moved from old project. - [x] Check if issue can be moved to another project before executing service - [x] Check permissions when moving an issue (`:admin_issue` ability) - [x] Display select box for a new project when editing an issue - [x] Show only projects that issue can be moved into in that select box - [x] Add project select handler, helper and some permission filters to it - [x] Preserve as much information as possible, including author - [x] Prepare mechanisms that unfolds local references in issue description - [x] Rewrite issue description with references unfolding and add some specs for it - [x] Rewrite all system notes and comments attached to issue that is being moved - [x] Update `Label` so that is was able to create cross reference labels (separate MR) - [x] Add notifications about moving issue to another project - [x] Display confirmation alert/message when issue move has been requested - [x] Make it possible to undo selecting project where issue will be moved to - [x] Add column to issue, that will indicate if it has been moved to another project - [x] Do not allow to move issue that has been already moved - [x] Write top-to-bottom feature spec in RSpec instead of Spinach UI: ![issue_move_ui](/uploads/b3c6b563362c1fded9082cc0f51e5a74/issue_move_ui.png) ![issue_move_tooltip](/uploads/2ab913b06f52df1cafde9abe89bd9cb8/issue_move_tooltip.png) Closes #3024 See merge request !2831
| * | | | | | | | | Do not rewrite reference if already a cross referenceGrzegorz Bizon2016-03-211-2/+4
| | | | | | | | | |
| * | | | | | | | | Change icon and cursor for issue move field tooltipfeature/issue-moveGrzegorz Bizon2016-03-201-2/+2
| | | | | | | | | |
| * | | | | | | | | Preserve created at time of notes when moving issueGrzegorz Bizon2016-03-202-1/+7
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-2023-57/+158
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Fix bug where wrong commit ID was being used in a merge request diff to show old image Remove CHANGELOG item that was added during merge resolution Improve the "easy WIP & un-WIP from link" feature Fix specs \#to_branch_name now uses the iid as postfix Add label description in tooltip to labels in issue index and sidebar Easily (un)mark merge request as WIP using link Use specialized system notes when MR is (un)marked as WIP another attempt to fix oauth issue attempting to fix omniauth problem Conflicts: app/assets/javascripts/issuable_form.js.coffee