summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Updated tests for deploy keysproject-deploy-keys-uiPhil Hughes2016-04-251-6/+4
|
* Project deploy keys updated UIPhil Hughes2016-04-253-82/+67
| | | | Closes #13992
* Use the `can?` helper instead of `current_user.can?`15513-fix-undefined-can-methodRémy Coutable2016-04-221-1/+1
| | | | | | Fixes #15513. Signed-off-by: Rémy Coutable <remy@rymai.me>
* Merge branch 'issue_3799' into 'master' Rémy Coutable2016-04-221-1/+10
|\ | | | | | | | | | | | | | | | | Allow filtering by Owned projects on dashboard page Closes #3799 ![Screen_Shot_2016-04-15_at_9.40.52_PM](/uploads/440498c5647bda282304891307931a02/Screen_Shot_2016-04-15_at_9.40.52_PM.png) See merge request !3762
| * Merge remote-tracking branch 'origin/master' into issue_3799Alfredo Sumaran2016-04-2176-276/+396
| |\
| * | Do not display filters if user if there's no current_userAlfredo Sumaran2016-04-211-7/+8
| | |
| * | Allow filtering by Owned projectsAlfredo Sumaran2016-04-181-1/+9
| | |
* | | Merge branch 'confirmation-screen' into 'master' Robert Speicher2016-04-222-0/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improved email confirmation UX Closes #4228 See merge request !3184
| * | | Improved confirmation UXconfirmation-screenPhil Hughes2016-04-212-0/+27
| | | | | | | | | | | | | | | | Closes #4228
* | | | Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-221-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always read diff_view setting from the cookie Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285 See merge request !3732
| * | | Always read diff_view setting from the cookieRobert Speicher2016-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557
* | | | Merge branch 'remove-update-files' into 'master' Yorick Peterse2016-04-213-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Removed JS update templates See merge request !3814
| * | | Removed JS update templatesremove-update-filesPhil Hughes2016-04-193-1/+1
| | |/ | |/|
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceRémy Coutable2016-04-214-52/+42
|\ \ \
| * \ \ Merge branch 'label-dropdown-fix' into 'master' Jacob Schatz2016-04-214-52/+42
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes "create label" functionality on label dropdown **Issue sidebar** ![label_dropdown](/uploads/2a056136fc88626530fc275ded0c2aa3/label_dropdown.gif) **Issues page** ![label_dropdown_issues](/uploads/965fd20f5b206499e9b11a64556c5240/label_dropdown_issues.gif) See merge request !3670
| | * \ \ Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fixAlfredo Sumaran2016-04-2010-20/+69
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into label-dropdown-fixAlfredo Sumaran2016-04-2061-270/+381
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/shared/issuable/_sidebar.html.haml
| | * | | | | Move shared html to a partialAlfredo Sumaran2016-04-183-34/+21
| | | | | | |
| | * | | | | Add is-link attribute to know if a menu item should not be stoppedAlfredo Sumaran2016-04-181-1/+1
| | | | | | |
| | * | | | | Fix Label dropdown and organize codeAlfredo Sumaran2016-04-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/labels_select.js.coffee
| | * | | | | Render proper partialAlfredo Sumaran2016-04-152-2/+2
| | | | | | |
| | * | | | | Add spacesAlfredo Sumaran2016-04-151-3/+3
| | | | | | |
| | * | | | | Reuse partial for Create Label pageAlfredo Sumaran2016-04-153-18/+21
| | | | | | |
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-04-211-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'issue_15434' into 'master' Jacob Schatz2016-04-211-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes XSS injection REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/15434 **Without the fix** ![xss1](/uploads/0a7b0b15fb87066965a7c73f1dbaa815/xss1.gif) **With the fix** ![xss2](/uploads/473cfa0aa80656f24c58aebf1fd97fff/xss2.gif) See merge request !1952
| | * | | | | | Remove unnecessary provided paramAlfredo Sumaran2016-04-211-1/+1
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge branch 'rs-issue-15408' into 'master' Robert Speicher2016-04-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix undefined local variable error in Invalid MR template Closes #15408 See merge request !3857
| * | | | | | | Fix undefined local variable error in Invalid MR templaters-issue-15408Robert Speicher2016-04-211-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes #15408
* | | | | | | Merge branch 'diff-link-fix' into 'master' Jacob Schatz2016-04-211-4/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff highlight fixes This fixes a couple of issues with linking/highlight diff lines: - Fixed issue with lines not being selectable when expanding diff - Fixed issue with incorrect line being highlighted if line is in discussion view See merge request !3725
| * | | | | | Put back removed line numberdiff-link-fixPhil Hughes2016-04-201-1/+1
| | | | | | |
| * | | | | | Fixed issue with lines not being selectable when expanding diffPhil Hughes2016-04-201-5/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'top-navigation-concept' into 'master' Dmitriy Zaporozhets2016-04-2113-24/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement top navigation for profile area Main idea is to keep left sidebar static so user is not confused by changing context. Instead we put changing navigation with changing content in one main block. I used profile area as a simplest way to implement and test this concept. Your feedback is welcome in comments For https://gitlab.com/gitlab-org/gitlab-ce/issues/14354#note_4878536 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3824
| * | | | | | Layout navigation should respect layout width settingstop-navigation-conceptDmitriy Zaporozhets2016-04-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Fix tests and remove countersDmitriy Zaporozhets2016-04-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Implement top navigation concept for profile areaDmitriy Zaporozhets2016-04-1913-22/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main idea is to keep left sidebar static so user is not confused by changing context. Instead we put changing navigation with changing content in one main block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'issue_5838' into 'master' Rémy Coutable2016-04-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show project members only for members fixes #5838 See merge request !3752
| * | | | | | | Show project members only for membersFelipe Artur2016-04-181-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'addtap' into 'master' Kamil Trzciński2016-04-211-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add tap coverage example to project settings Previously, there were examples for Simplecov, pytest-cov, and phpunit. This adds an example for using the tap cli tool (https://github.com/tapjs/node-tap) Before: ![Screen_Shot_2016-04-07_at_9.57.32_AM](/uploads/2864d4cd4b5288565057263a435a851f/Screen_Shot_2016-04-07_at_9.57.32_AM.png) After: ![Screen_Shot_2016-04-07_at_9.57.16_AM](/uploads/62901e01c4ad6db86e4ced3dfebd20b9/Screen_Shot_2016-04-07_at_9.57.16_AM.png) See merge request !3597
| * | | | | | | add tap coverage example to project settingsEvan Lucas2016-04-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, there were examples for Simplecov, pytest-cov, and phpunit. This adds an example for using the tap cli tool (https://github.com/tapjs/node-tap)
* | | | | | | | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-2113-100/+106
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipelineKamil Trzcinski2016-04-1930-187/+246
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | Make some logic less twistableKamil Trzcinski2016-04-173-8/+9
| | | | | | | | | |
| * | | | | | | | | Revert unneeded changesKamil Trzcinski2016-04-161-1/+1
| | | | | | | | | |
| * | | | | | | | | Rename CiStatus to StatusableKamil Trzcinski2016-04-161-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1639-107/+179
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | Optimise Merge Request builds renderingKamil Trzcinski2016-04-132-4/+5
| | | | | | | | | | |
| * | | | | | | | | | Cleanup changesKamil Trzcinski2016-04-137-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1314-105/+114
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-1138-230/+120
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/commits/_commit.html.haml
| * | | | | | | | | | | | Fix specsKamil Trzcinski2016-04-112-3/+3
| | | | | | | | | | | | |