Commit Graph

244 Commits

Author SHA1 Message Date
Z.J. van de Weg 67fde38806 Improve the mattermost help box
Also added tests, and moved the slack test to a better location.
2016-11-21 17:58:40 +01:00
Fatih Acet 0ed8c45978 Merge branch 'pipelines-page-redesign' into 'master'
Pipelines page redesign

Closes #23637
![Screen_Shot_2016-11-15_at_1.36.34_PM](/uploads/edc6a58f00cca3e03ffd1689bd6eebd8/Screen_Shot_2016-11-15_at_1.36.34_PM.png)

See merge request !7487
2016-11-18 12:48:28 +00:00
Douglas Barbosa Alexandre 23f45e842c Add feature spec for labels subscription 2016-11-17 15:10:13 -02:00
Annabel Dunstone Gray 4ce2ca4d36 Fix pipelines spec 2016-11-16 16:29:12 -06:00
Robert Speicher 28d9645926 Merge branch '21992-disable-access-requests-by-default' into 'master'
Disable the "request access" functionality by default for new groups and projects

Currently this feature is enabled by default, and additional action is required to disable it.

Closes #21992 
Closes !7011

See merge request !7425
2016-11-16 14:50:45 +00:00
Annabel Dunstone Gray 5ac2c5839a Create separate view for pipeline view with tabs 2016-11-15 13:50:56 -06:00
Robert Speicher 352d880a50 Merge branch 'issue_20245' into 'master'
Fix project Visibility level selector not using default values

closes #20245

See merge request !7264
2016-11-14 10:05:30 +00:00
Vincent Composieux af941732ed
Added ability to put emojis into repository name
Added ability to put emojis into repository name
2016-11-12 09:21:23 +01:00
Nick Thomas d211011698 Make access request specs explicitly enable or disable access requests as required 2016-11-11 15:45:47 +00:00
Felipe Artur d1f0b2f433 Fix project Visibility level selector not using default values 2016-11-10 14:41:03 -02: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
Luke "Jared" Bennett e517da3ff0
Created wait_for_turbolinks and added test for refs dropdown selection with special chars 2016-11-04 15:23:54 +00:00
Valery Sizov dcd70453a4 Fix: Guest sees some repository details and gets 404 2016-11-04 13:06:48 +02:00
Sean McGivern a30d34b2e7 Merge branch 'spec_optimization' into 'master'
Make specs a bit faster

See merge request !6992
2016-11-04 10:48:01 +00:00
Alfredo Sumaran 0ed0ad5d57 Merge branch '23273-retry-build-btn' into 'master'
Resolve "Improve build "Retry" button on Build Page"

* On desktop, adds retry button on build page header
* On mobile, adds retry button in sidebar

![Screen_Shot_2016-10-28_at_1.35.07_PM](/uploads/2f9f87a9fc3e85c9aafc8c3d7a231639/Screen_Shot_2016-10-28_at_1.35.07_PM.png)
![Screen_Shot_2016-10-26_at_1.01.44_PM](/uploads/d02ce3a422a505b14ab357f695de8bba/Screen_Shot_2016-10-26_at_1.01.44_PM.png)

Closes #23273

See merge request !7126
2016-11-02 06:02:03 +00:00
Fatih Acet bd0bd8ccdc Merge branch 'project-activity-tabs-hide' into 'master'
Hide project activity tabs when features are disabled

## What does this MR do?

When features are disabled in project settings, the activity tabs are now correctly hidden.

## Screenshots (if relevant)

![Screen_Shot_2016-10-21_at_12.15.27](/uploads/3d85c027aa05487001c8abd624a99be0/Screen_Shot_2016-10-21_at_12.15.27.png)

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/19734#note_17224181

See merge request !7038
2016-11-01 18:37:25 +00:00
Valery Sizov a6ba358a8f Make specs a bit faster 2016-11-01 14:46:59 +02:00
Adam Niedzielski f6cff8f7bc Fix relative links in Markdown wiki when displayed in "Project" tab
Refers to #23806.
2016-11-01 10:18:49 +01:00
Phil Hughes b5decb2181 Hide project activity tabs when features are disabled 2016-11-01 08:35:23 +00:00
Felipe Artur cabc2a7160 Fix builds tab visibility 2016-10-31 09:05:01 +00:00
Annabel Dunstone Gray 7c977e10d2 Fix failing builds_spec 2016-10-27 08:13:00 -05:00
Phil Hughes 3812f0dc6d Removed delete branch tooltip and tests
Closes #23253
2016-10-26 13:10:14 -05:00
Luke Bennett 7664c76a16
Removed append logic
Updated test
2016-10-21 21:53:10 +01:00
Adam Niedzielski 2e411b5ea0 Test GitLab project import for a user with only their default namespace.
Refactor the spec file:
- remove hardcoded record IDs
- avoid top-level let if not used in all scenarios
- prefer expect { ... }.to change { ... }.from(0).to(1) over checking
that there are no records at the beginning of the test
2016-10-20 15:22:04 +02:00
James Lopez 891e5f4851 Update specs to cope with new label types and priorities
Fixed all related specs and also changed the logic to handle edge cases. This includes exporting and exporting of group labels, which will get associated with the new group (if any) or they will become normal project labels otherwise.

Found other issues to do with not being able to import all labels at once in the beginning of the JSON - code was much simpler when we import all labels and milestones associated to a project first, then the associations will find the already created labels instead of creating them from the associations themselves.
2016-10-19 14:58:28 -02:00
Douglas Barbosa Alexandre 67314e95ae Add support to group labels prioritization on project level 2016-10-19 14:58:27 -02:00
James Lopez 848a146fc3 Fix import test 2016-10-19 14:58:25 -02:00
Douglas Barbosa Alexandre 0bfa39d5bd Remove scopes/types for labels 2016-10-19 14:58:25 -02:00
Douglas Barbosa Alexandre fd0ba37276 Update project test file for project import integration test 2016-10-19 14:58:25 -02:00
Douglas Barbosa Alexandre bdb7bf4b51 List group labels on project labels page 2016-10-19 14:58:24 -02:00
Jacob Schatz d25a1f305a Merge branch '21192-retried-builds' into 'master'
Fix retried builds styling

#### What does this MR do?
Adds background color to retried builds and an icon + tooltip on retried builds in build list

#### Screenshots (if relevant)
<img src="/uploads/4138dd277c185de3c271b2eb9b459761/Screen_Shot_2016-10-13_at_2.44.27_PM.png" width="500px">
<img src="/uploads/99227d5ed3816a509660fe5a84da5b2a/Screen_Shot_2016-10-13_at_3.01.13_PM.png" width="500px">
#### What are the relevant issue numbers?
Closes #21192

See merge request !6109
2016-10-18 16:46:55 +00:00
Kamil Trzciński 146e0cbc4d Merge branch 'fix/pipeline-settings-page' into 'master'
Fix save button on pipelines settings page

## What does this MR do?

This MR fixes 'Save button' on pipeline settings page, which didn't change state to enabled after saving settings.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing

## What are the relevant issue numbers?

Closes #23431

See merge request !6955
2016-10-18 13:48:25 +00:00
Annabel Dunstone Gray 2115c360d0 Remove unnecessary retried check & fix test failures 2016-10-18 08:29:29 -05:00
Grzegorz Bizon b8a49e574a Move specs for project pipeline settings page 2016-10-18 12:58:11 +02:00
Felipe Artur da07c2e4d3 Add visibility level to project repository 2016-10-17 18:12:18 -02:00
Phil Hughes f91df171c5 Fixed find file keyboard navigation
Closes #23423
2016-10-17 16:55:34 +01:00
Fatih Acet 66855f6262 Merge branch 'members-ui' into 'master'
Project members UI

## What does this MR do?

New UI for project members that includes groups.

## Screenshots (if relevant)


### Project members

![Screen_Shot_2016-09-02_at_15.13.27](/uploads/b9d4a634d44b7b7bbb6eddb10aee86bd/Screen_Shot_2016-09-02_at_15.13.27.png)

### Group members

![Screen_Shot_2016-09-02_at_15.13.36](/uploads/c15c173e68b2c0b49bcd06ca560269d3/Screen_Shot_2016-09-02_at_15.13.36.png)

## What are the relevant issue numbers?

Part of #19868 

Closes #21320 

See merge request !6148
2016-10-14 12:25:23 +00:00
Luke Bennett ae851edc3c
Added no-template functionality
Added tests
2016-10-13 15:48:07 +01:00
Valery Sizov b4004488f7 Make guests unable to view MRs 2016-10-11 16:51:26 +03:00
Phil Hughes 996e802415 Merge branch 'master' into members-ui 2016-10-06 15:30:34 +01:00
Kamil Trzciński 0bbeff3d5e Merge branch 'feature/improve-async-pipeline-processing' into 'master'
Improve asynchronous pipeline processing

## What does this MR do?

This MR improves asynchronous processing of pipeline.

## Why was this MR needed?

It eliminates some race conditions and improves performance.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing

## What are the relevant issue / merge request numbers?

Related merge request:  !6410  
Extracted from !6411

See merge request !6650
2016-10-06 08:42:35 +00:00
Rémy Coutable d51bb99a7e
Merge commit 'dev/security' into 'master'
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-06 08:33:11 +02:00
Grzegorz Bizon ebeee31100 Fix pipeline fixtures and calls to removed method 2016-10-04 14:43:24 +02:00
Phil Hughes 2a6942abef Merge branch 'master' into members-ui 2016-10-04 11:03:07 +01:00
Joseph Frazier ad2b6cae0b Append issue template to existing description
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21733

Add two newlines before the template if the existing description isn't
empty. This makes it easier to see where the template begins.

Don't append the template when "Reset template" is selected, of course.

Don't append template if it equals the existing description. This makes
it so that selecting a template twice doesn't duplicate it.
2016-10-03 12:16:02 -04:00
James Lopez a09e1d3dda Enable import/export back for non-admins 2016-10-03 10:53:18 +02:00
Robert Speicher e64594ac44 Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have-requested-access' into 'master'
Resolve "`Member.add_user`doesn't detect existing members that have requested access"

## What does this MR do?

This merge request handle the case when an access requester is added to a group or project (via the members page or the API).

In `Member.add_user`, if an access requester already exists, we simply accept their request (and set the `created_by`, `access_level` and `expires_at` attributes if given).

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

I've taken the opportunity to cleanup the whole `{Group,Project}Member.add_user*` methods since it was quite a mess.

## What are the relevant issue numbers?

Closes #21983

See merge request !6393
2016-10-02 11:42:57 +00:00
Luke Bennett 70f7d2446a Review changes
Updated tests
2016-10-01 00:01:47 +03:00
Luke Bennett 61afa65d4e Added soft wrap logic and button to editor
Added tests

Added awesomeeeeee icons
2016-10-01 00:01:47 +03:00
James Lopez 958d9f11e8 fix export project file permissions issue 2016-09-30 16:10:48 +02:00