Commit Graph
1318 Commits
Author SHA1 Message Date
Grzegorz Bizon 2bb0eecb20 Enable Style/SpaceAfterMethodName rubocop cop
See #17478
2016-05-30 14:41:34 +02:00
Grzegorz BizonandRobert Speicher dbba60029c Improve note factory 2016-05-29 15:03:00 -04:00
Grzegorz BizonandRobert Speicher e558edd1ce Update specs to carry out changes in note factory 2016-05-29 15:03:00 -04:00
Jacob Schatz 3d009f7785 Merge branch 'updated-contrib-calendar' into 'master'
POC: Updated contrib calendar

In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it?

![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png)

cc. @jschatz1 

See merge request !3944
2016-05-25 23:29:41 +00:00
Jacob Schatz 891c94852d Merge branch 'fix-grammar-issues' into 'master'
Fix grammar and wording in text on various pages.

## What does this MR do?

Fixes various grammatical and/or wording issues I found while copyediting on the plane :)

## Why was this MR needed?

Incorrect grammar and weird/confusing wording makes the product look less polished and professional.

See merge request !4237
2016-05-25 19:26:22 +00:00
Dmitriy Zaporozhets c04f85a333 Merge branch 'rs-rubocop-nottonot' into 'master'
Enable RSpec/NotToNot cop and auto-correct offenses

Ref: https://gitlab.com/gitlab-org/gitlab-ce/issues/17761

See merge request !4267
2016-05-25 16:46:29 +00:00
Jacob Schatz d6e5299fb6 Merge branch 'snippets-ui' into 'master'
Updated snippets UI

![Screen_Shot_2016-05-18_at_14.11.54](/uploads/2544351e50f19a36c4ba9a7a92d5544b/Screen_Shot_2016-05-18_at_14.11.54.png)

Closes #14328

See merge request !4194
2016-05-24 21:15:19 +00:00
Jacob Schatz 05323a7855 Merge branch 'project-settings' into 'master'
Project settings UI update

![Screen_Shot_2016-05-16_at_16.42.55](/uploads/2e308cbf26a002fc411c3e84b663a5d1/Screen_Shot_2016-05-16_at_16.42.55.png)![Screen_Shot_2016-05-16_at_16.43.01](/uploads/8d983c43307c65852efe002f6e9482d9/Screen_Shot_2016-05-16_at_16.43.01.png)![Screen_Shot_2016-05-16_at_16.43.16](/uploads/6124e0600cc0e5b309a60b065409d537/Screen_Shot_2016-05-16_at_16.43.16.png)![Screen_Shot_2016-05-16_at_16.43.13](/uploads/177976c2c08034e096e7ebdcad1f369f/Screen_Shot_2016-05-16_at_16.43.13.png)

See merge request !4162
2016-05-24 21:11:30 +00:00
Robert Speicher 75739e54be Enable RSpec/NotToNot cop and auto-correct offenses
Also removes the note from the development/testing.md guide
2016-05-24 15:40:29 -04:00
Dmitriy Zaporozhets 2f4dc1ee16 Merge branch 'master' into project-navigation-redesign 2016-05-23 22:41:11 +02:00
Connor Shea 1a85f80b78 Fix grammar and wording in text on various pages. 2016-05-22 10:41:30 -06:00
Phil Hughes 10e3de7a45 Fixed project settings tests 2016-05-20 08:49:31 +01:00
Phil Hughes d53bfcb0bb Updated snippets tests 2016-05-19 10:01:27 +01:00
Kamil Trzcinski bfc6799c93 Fix spinach tests 2016-05-16 18:13:44 -05:00
Dmitriy Zaporozhets 442083e0fc Fix file browsing test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-16 17:56:39 -05:00
Dmitriy Zaporozhets ff5109e19c Fix shortcuts tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-16 17:36:06 -05:00
Kamil Trzcinski d0eb9438e9 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-05-16 17:13:14 -05:00
Dmitriy Zaporozhets 79b9ff6076 Modify tests to match new navigation behaviour for project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-16 12:36:27 -05:00
Phil Hughes 1c9440c2cf tests update 2016-05-16 12:22:17 +01:00
Kamil Trzcinski 7d907acc38 Fix spinach tests 2016-05-14 14:51:57 -05:00
Douwe Maan c452fa8124 Update specs 2016-05-13 17:31:58 -05:00
Gabriel Mazetto f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -03:00
Robert Speicher d8415389de Merge branch 'hook-docs-behavior' into 'master'
Improve documentation and web test for web hooks

Tips and documentation of actual hook behavior. Improved user feedback
when testing hooks via the web UI.

See merge request !4015
2016-05-11 16:34:00 +00:00
Rémy Coutable 1026f2ad09 Add integration specs for tags
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-10 11:45:03 +02:00
Rémy Coutable d4d34b161b Merge branch 'rs-backport-ee-372' into 'master'
Backport changes from gitlab-org/gitlab-ee!372

Mostly replaces several Spinach tests with RSpec Feature tests.

See merge request !4043
2016-05-09 14:48:48 +00:00
Jacob Vosmaer a19508d6b7 Fix test failures 2016-05-09 13:58:43 +02:00
Dmitriy Zaporozhets 3592a59715 Merge branch 'master' into group-navigation-redesign 2016-05-05 11:44:03 +02:00
Robert Speicher f18ec70743 Backport changes from gitlab-org/gitlab-ee!372
Mostly replaces several Spinach tests with RSpec Feature tests.
2016-05-04 17:05:16 -04:00
Jacob Schatz 8be1118aa5 Merge branch 'clean-user-profile-classes' into 'master'
Remove unused .contributed-projects class

While working on #13401 and trying to add a new tab to the user profile
page, I came across this. I noticed that the `contributed-projects`
class was only being used in order to select the div in the tests. For
consistency with the other tabs, I decided to remove this class and use
the div's id for the selector.

See merge request !3945
2016-05-04 18:34:34 +00:00
Rémy Coutable 1a9d505972 Merge branch 'use-rugged-to-create-tag' into 'master'
Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance

This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request.

Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too.

See merge request !3745
2016-05-04 16:07:13 +00:00
Rémy Coutable c2c70cfcb3 Merge branch 'fix-typo-in-user-steps' into 'master'
Fix typo in user steps feature file

Just came across a typo in the user steps file.

See merge request !3943
2016-05-04 15:58:24 +00:00
Rémy Coutable 44f89eafc0 Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-04 17:19:13 +02:00
Dmitriy Zaporozhets 774af93027 Remove go to dashboard test suite for group page and get rid of AR warning
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-05-03 13:04:47 +02:00
Jacob Schatz 14c2c573a3 Merge branch 'project-webhooks-ui' into 'master'
Project webhooks updated UI

Closes #13993 

![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png)

![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png)

See merge request !3922
2016-04-28 20:16:36 +00:00
Jacob Schatz bdcba43873 Merge branch 'project-deploy-keys-ui' into 'master'
Project deploy keys updated UI

Closes #13992

See merge request !3912
2016-04-28 20:16:04 +00:00
Karlo Soriano c8187738a2 Remove unused .contributed-projects class
While working on #13401 and trying to add a new tab to the user profile
page, I came across this. I noticed that the `contributed-projects`
class was only being used in order to select the div in the tests. For
consistency with the other tabs, I decided to remove this class and use
the div's id for the selector.
2016-04-27 19:36:04 +08:00
Karlo Soriano 6b2489f200 Fix typo in user steps feature
[ci skip]
2016-04-27 17:53:32 +08:00
Phil Hughes b651303ea6 Updated tests 2016-04-26 14:14:34 +01:00
Phil Hughes f5bea9df53 Fixed tests 2016-04-26 09:03:04 +01:00
Phil Hughes 54493b9aae Updated tests for deploy keys 2016-04-25 17:45:05 +01:00
Dmitriy Zaporozhets f4859b93a5 Merge branch 'top-navigation-concept' into 'master'
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
2016-04-21 11:48:28 +00:00
Kamil Trzciński d240666800 Merge branch 'ci-commit-as-pipeline' into 'master'
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
2016-04-21 08:10:37 +00:00
Jacob Schatz 692c35e6f4 Merge branch 'multi-filter-labels' into 'master'
Mutliple label filter

Fixes #989 

See merge request !3438
2016-04-20 19:18:32 +00:00
Robert Speicher 3d4875f86a Merge branch 'license-templates-and-api-12804' into 'master'
License templates when creating/editing a LICENSE file

Closes #12804

See merge request !3660
2016-04-20 01:38:49 +00:00
Dmitriy Zaporozhets 52268d1d9a Fix tests and remove counters
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-04-19 21:11:33 +02:00
Kamil Trzcinski 27e0c7723c Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline
# Conflicts:
#	db/schema.rb
2016-04-19 14:00:14 -04:00
Robert Speicher 7b09bab68e Merge branch 'mr-formatting' into 'master'
use ! rather than # for merge request references

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15278

See merge request !3740
2016-04-19 16:23:41 +00:00
Ben Bodenmiller b68e3925ff format merge request references properly 2016-04-18 23:32:02 -07:00
Rémy Coutable b2370fefad Fix specs
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18 14:47:50 +02:00
Rémy Coutable 0aaaae9d05 Fix features specs (hopefully)
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-04-18 14:47:50 +02:00