Commit Graph

1542 Commits

Author SHA1 Message Date
David Wagner b3ed4e0cf9 Homogenize dropdowns on Issue page
Make sort and filter dropdowns look the same and tweak their icon and
colors according to #24150.

Signed-off-by: David Wagner <david@marvid.fr>
2016-11-28 23:18:03 +01:00
Robert Speicher fe4ae12ec8 Merge branch 'rephrase-system-notes' into 'master'
Rephrase some system notes to be compatible with new system note style

See merge request !7692
2016-11-25 04:36:13 +00:00
Rémy Coutable c66502a2fb Merge branch 'move-admin-spam-spinach-test-to-rspec' into 'master'
Move admin spam spinach test to RSpec

See merge request !7708
2016-11-24 13:26:33 +00:00
Douwe Maan 6df22f72c6 Rephrase some system notes to be compatible with new system note style 2016-11-24 18:26:29 +08:00
Douwe Maan a7a9db803b Merge branch 'dz-allow-nested-group-routing' into 'master'
Add nested groups support to the routing

## What does this MR do?

It allows routing with `/` in namespace name 

## Why was this MR needed?

For nested groups feature(https://gitlab.com/gitlab-org/gitlab-ce/issues/2772). We need URI like `/group/subgroup/project` be routed correctly


## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 it does - 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-ce/issues/2772

See merge request !7459
2016-11-24 04:31:54 +00:00
Rémy Coutable f70a6f3dca Merge branch 'move-admin-abuse-report-spinach-test-to-rspec' into 'master'
Move admin abuse report spinach test to RSpec

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

See merge request !7691
2016-11-24 01:47:21 +00:00
Semyon Pupkov 73f6218ec4 Move admin abuse report spinach test to rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-11-23 21:40:29 +05:00
Semyon Pupkov c18f96cfe9 Move admin spam spinach test to Rspec
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-11-23 20:18:35 +05:00
Semyon Pupkov 5636825fd0 Move abuse report spinach test to rspec
part of https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2016-11-23 19:30:07 +05:00
Dmitriy Zaporozhets 6683fdcfb0
Add nested groups support to the routing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-23 14:08:36 +02:00
Jacob Schatz a7616e03c5 Merge branch '20840-getting-started-better-empty-state-for-issues-view' into 'master'
Issues empty state

## What does this MR do?

Adds the empty state for the project, dashboard and group issues.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

## Screenshots (if relevant)

### Filtered to show no issues (on group issues page in this case but also dashboard and projects)

![Screen_Shot_2016-11-08_at_20.55.56](/uploads/b598af4a8a5e2c9fbb859abf36e70e4b/Screen_Shot_2016-11-08_at_20.55.56.png)

### Project with no issues

![Screen_Shot_2016-11-08_at_20.57.08](/uploads/8f54fdf1b3101c46299249fa2944207d/Screen_Shot_2016-11-08_at_20.57.08.png)

![Screen_Shot_2016-11-08_at_20.57.17](/uploads/1d2d162e1d845dd05e945d8ebb1d2101/Screen_Shot_2016-11-08_at_20.57.17.png)

### Group with no projects with any issues

![Screen_Shot_2016-11-08_at_20.54.55](/uploads/f28dc2038839d5bda0eb37f37927d5db/Screen_Shot_2016-11-08_at_20.54.55.png)

## Does this MR meet the acceptance criteria?

- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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?


Closes #20840 

Closes #20850

See merge request !7309
2016-11-22 02:24:23 +00:00
Luke "Jared" Bennett a08fba63be
Added empty state svg and set up blank conditional
Added new spec step

Added empty state to dashboard

Split empty and filtered empty states

Moved empty_state icons into their own folder and DRY up empty state html

Fixed failing spec

Added to groups page

Review changes
2016-11-18 03:57:36 +00:00
Sean McGivern 657d470f44 Merge branch '24010-Add-named-anchors-for-diffs-in-the-commit-page' into 'master'
Adds hash anchors to diff_files to make possible linking exact file in commit

Closes #24010

See merge request !7298
2016-11-17 10:14:55 +00:00
Dmitriy Zaporozhets e38acad435 Merge branch 'move-snippet-discover-spinach-test-to-rspec' into 'master'
Move 'Explore Snippets' Spinach feature to Rspec

## What does this MR do?
It moves the `features/snippets/discover.feature` Spinach test to a Rspec feature.

## Are there points in the code the reviewer needs to double check?
The original feature was called 'Discover Snippets', but the UI no longer reflects this wording. The new Rspec feature is called 'Explore Snippets' to reflect UI/Controller/View naming in use.

## Why was this MR needed?
As part of deprecating the Spinach test suite.

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [-] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
  - [ ] 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 it does - 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?
#23036

See merge request !7349
2016-11-16 14:15:41 +00:00
the-undefined dbf5c8abfe Move 'Search Snippets' Spinach feature to Rspec
This commit moves the `search_snippets.feature` Spinach test to a
Rspec feature, as part of deprecating the Spinach test suite.

- Remove Spinach discover snippets feature and steps
- Remove unused `SharedSearch` module
- Add Rspec feature scenarios
2016-11-16 06:52:43 +00:00
Yar 8782bb96cc Unify anchor link format for MR diff files !7298
Right now, the following naming scheme for diff files is used: diff-1, diff-2, ... and also we have "internal" format which is file-path-HASH, where HASH is sha1 of file path.
Besides, we have HASH_lineA_lineB format to link exact line number in MR diff. It makes sence to unify the way we link diff from outside, while leave "file-path-HASH" format for internal (js) usage.
Changes in this commit  allow to link diff just by HASH, if we don't want specify exact lines, also it changes "file-path-HASH" and "diff-NUMBER" links in code to this unified format.

Inspired by #24010 and !7298
2016-11-15 20:51:21 +03:00
Sean McGivern 7be41074bb Merge branch 'dz-refactor-namespace-regex' into 'master'
Refactor namespace regex

Reuse existing namespace regex constant in routing

See merge request !7336
2016-11-08 12:51:51 +00:00
Douwe Maan 9c3f3e9e35 Merge branch 'use-separate-token-for-incoming-email' into 'master'
Use separate email-friendly token for incoming email

See merge request !5914
2016-11-08 10:47:45 +00:00
Sean McGivern 55e0065b49 Merge branch 'fix-404-on-network-when-entering-a-nonexistent-git-revision' into 'master'
Network page appear with an error message when entering nonexistent git revision

Closes #2362

See merge request !7172
2016-11-08 09:31:43 +00:00
Dmitriy Zaporozhets 34962c7d08
Update non-exist group spinach test to match routing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-08 10:13:13 +02:00
the-undefined 903431e889 Move 'Explore Snippets' Spinach feature to Rspec
This commit moves the `snippets/discover.feature` Spinach test to a
Rspec feature, as part of deprecating the Spinach test suite.

The original feature was called 'Discover Snippets', but the UI no
longer reflects this wording. The new Rspec feature is called
'Explore Snippets' to reflect UI/Controller/View naming in use.

- Remove Spinach discover snippets feature and steps
- Add Rspec feature test
2016-11-08 06:37:02 +00:00
tiagonbotelho 011e561bfa implements reset incoming email token on issues modal and account page,
reactivates all tests and writes more tests for it
2016-11-07 15:56:18 +00:00
Lisanne Fellinger e6e4147880 Rewritten spinach git_blame tests to rspec feature tests
Fixing rubocop violations

Relocated git_blame spec and fixed styling issue

Rewritten spinach git_blame tests to rspec feature tests

Fixing rubocop violations

Relocated git_blame spec and fixed styling issue

Rewritten spinach git_blame tests to rspec feature tests

Fixing rubocop violations

Rewritten spinach git_blame tests to rspec feature tests

Fixing rubocop violations

Rewritten spinach git_blame tests to rspec feature tests

Fixing rubocop violations

Relocated git_blame spec and fixed styling issue
2016-11-07 15:17:52 +01:00
Hiroyuki Sato 8d0e84bcf4 Fix spinach test 2016-11-06 12:05:13 +09:00
Robert Speicher 50f3fd49a2 Merge branch 'move-public-snippets-feature-to-rspec' into 'master'
Move Spinach public snippet feature test to RSpec feature

See #23036

See merge request !7256
2016-11-05 06:43:05 +00:00
Annabel Dunstone Gray 5d0f68f26b Fix diff_comments failure 2016-11-04 11:23:58 -05:00
the-undefined 27528d4490 Move spinach public snippet feature to rspec spec
- Add rspec feature for public snippets
- Remove spinach test for public snippets
2016-11-04 06:58:40 +00:00
Lukas Erlacher e900e53aa5 Show log corresponding to env in admin/logs
No matter which environment Gitlab was running as, the admin/logs view
always showed production.log. This commit selects the logfile based
on Rails.env.

- Rename ProductionLogger to EnvironmentLogger
- Make EnvironmentLogger logfile depend on env
- Update spinach test for log tabs
2016-11-03 22:02:47 +01:00
Rémy Coutable 808d49978c Merge branch 'create_hooks_rake' into 'master'
Add Rake task to create/repair GitLab Shell hooks symlinks

## What does this MR do?

Adds a Rake task wrapper around `gitlab-shell` `bin/create_hooks` script. This makes it easier for an administrator to repair hooks symlinks without worrying about where repository data is located, etc. Just run this task and it takes care of everything based on current configuration. 

## Are there points in the code the reviewer needs to double check?

No.

## Why was this MR needed?

`bin/create_hooks` was not well-documented. It requires parameters specifying where repository data is located. It also needs to be run by the `git` user. Wrapping it in a Rake task allows us to take current configuration in to account and makes it easier on the administrator. 


See merge request !5634
2016-11-02 10:40:48 +00:00
Drew Blessing af5322e90b Add Rake task to create/repair GitLab Shell hooks symlinks 2016-11-01 14:52:59 -05:00
Annabel Dunstone Gray 441948f438 Fix spinach tests 2016-11-01 10:58:07 -05:00
Annabel Dunstone Gray 240b35b130 Fix commits spec 2016-10-28 09:00:30 -05:00
Felipe Artur c2d6822e94 Finish updates to use JIRA gem
Code improvements, bug fixes, finish documentation and specs
2016-10-26 15:02:16 -02:00
Callum Dryden 9124310f28
Differentiate the expire from leave event
At the moment we cannot see weather a user left a project due to their
membership expiring of if they themselves opted to leave the project.
This adds a new event type that allows us to make this differentiation.
Note that is not really feasable to go back and reliably fix up the
previous events. As a result the events for previous expire removals
will remain the same however events of this nature going forward will be
correctly represented.
2016-10-20 00:26:45 +00:00
Douglas Barbosa Alexandre 9cb1238434 Fix project issues labels feature spec 2016-10-19 14:58:27 -02:00
Dmitriy Zaporozhets 82033e2edc
Wait for ajax for every merge request spinach test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-18 18:55:11 +03:00
Dmitriy Zaporozhets 5c9a54d65f Merge branch 'dz-fix-spinach-mr' into 'master'
Fix randomly crashing spinach test for merge request

For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378

See merge request !6932
2016-10-17 11:27:39 +00:00
Dmitriy Zaporozhets 77bbd9857f
Fix randomly crashing spinach test for merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-17 13:59:59 +03:00
Valery Sizov 7df7a92b0a [Great spinach fix] Replace gsub with delete 2016-10-17 13:29:45 +03:00
Luke Bennett aa76fa55f7 Remove carriage returns from commit description as summary is on a newline and will always include carriage returns 2016-10-17 13:29:45 +03:00
Dmitriy Zaporozhets 052de0600c Merge branch 'fix-trending-projects-spinach-failure' into 'master'
Fix trending projects Spinach failure

The trending projects list is now pre-calculated. To make this work with the Spinach test, we have to manually refresh the list.
    
Partial fix to #23378

See merge request !6911
2016-10-17 08:29:08 +00:00
Luke Bennett 93e464f454 Added logic to handle a revision input that does not exist in the menu 2016-10-16 20:02:16 -07:00
Stan Hu d78c667d58 Fix broken Spinach tests caused by changes in !6550
Partial fix to #23378
2016-10-16 20:02:16 -07:00
Dmitriy Zaporozhets a453dacec2 Merge branch 'dz-fix-branches-tab-test' into 'master'
Fix active tab test for branches page

For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378

See merge request !6923
2016-10-16 19:58:20 +00:00
Dmitriy Zaporozhets cd6af26de2
Fix active tab test for branches page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-16 20:49:05 +03:00
Dmitriy Zaporozhets 9e30b75e9c
Fix merge requests feature tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-16 20:40:52 +03:00
Dmitriy Zaporozhets b1b197ae5e
Wait for ajax call in merge request unsubscribe test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-16 20:03:07 +03:00
Stan Hu 5a8738a7b4 Fix Spinach merge request diff failures
gitlab-git-test `master` was updated in ff076d88, and this caused
the merge request diffs to change in a way that broke assumptions in the
Spinach tests.

Partial fix to #23378
2016-10-15 15:28:30 -07:00
Stan Hu 762b63e569 Fix Spinach failure due overprecise percentage matching
The percentages in the language match changed by a tenth of a percentage point
for Ruby and JavaScript, which led to this failure.

Partial fix to #23378
2016-10-14 17:07:38 -07:00
Stan Hu 5b5c7e048b Fix trending projects Spinach failure
The trending projects list is now pre-calculated. To make this work
with the Spinach test, we have to manually refresh the list.

Partial fix to #23378
2016-10-14 16:58:55 -07:00