Commit Graph
25300 Commits
Author SHA1 Message Date
Zeger-Jan van de Weg 481e73fb76 Merge branch 'master' into new-branch-button-issue 2016-03-17 11:13:16 +01:00
Robert Schilling 4171933c09 Merge branch 'patch-1' into 'master'
Fix typo in README.md



See merge request !3250
2016-03-17 07:35:23 +00:00
Robert Speicher c280edd31c Merge branch 'fix_wiki_links' into 'master'
Fix wiki search results point to raw source

Closes https://github.com/gitlabhq/gitlabhq/issues/9581

See merge request !3138
2016-03-17 02:58:12 +00:00
Jacob Schatz 6dad864088 Merge branch 'css-zero-unit-fix' into 'master'
Follow the CSS Style Guide rules for unitless zero values.

Discussed in #14299.

cc: @rspeicher @jschatz1 

See merge request !3259
2016-03-17 02:36:56 +00:00
connorshea e106597e31 Follow the CSS Style Guide rules for unitless zero values.
Updated Emoji Rake task to conform to style guide.

Discussed in #14299.

[ci skip]
2016-03-16 19:23:23 -06:00
Hiroyuki Sato f0b052e168 Fix wiki search results point to raw source 2016-03-17 08:58:52 +09:00
Robert Speicher 6349f4909b Merge branch 'danielcarraro/gitlab-ce-feature/omniauth-auth0-gem' into 'master'
omniauth-auth0 gem support

See merge request !3246
2016-03-16 20:33:07 +00:00
Jacob Schatz 0af98b219c Merge branch 'dropdown-caret-color' into 'master'
Fixes issue with dropdown caret being incorrect color

Previously:

![Screen_Shot_2016-03-16_at_19.31.20](/uploads/b887a7b8249f172513c68289c52a4cf7/Screen_Shot_2016-03-16_at_19.31.20.png)

Now:

![Screen_Shot_2016-03-16_at_19.29.37](/uploads/9c0d6a3002c18a8c7890df8dce612dcb/Screen_Shot_2016-03-16_at_19.29.37.png)



See merge request !3254
2016-03-16 19:50:37 +00:00
Phil Hughes 6f9bda6b2d Fixes issue with dropdown caret being incorrect color 2016-03-16 19:29:53 +00:00
Mark Pundsack 315d875954 Fix typo in README.md. 2016-03-16 18:04:42 +00:00
Yorick Peterse 39fb836c48 Merge branch 'ci-runners-token-index' into 'master'
See merge request !3249
2016-03-16 16:00:17 +00:00
Jacob Schatz 3b95d59b35 Merge branch 'css-hex-format' into 'master'
Follow the CSS Style Guide rules for HEX colors.

Use lowercase letters and shorthand values for HEX colors where possible, in accordance with the CSS Style Guide.

Discussed in #14299.

\cc @jschatz1 @rspeicher

See merge request !3238
2016-03-16 15:13:23 +00:00
Jacob Vosmaer 91fa250038 Merge branch 'git-version' into 'master'
Install Git 2.7.3, not 2.4.3



See merge request !3248
2016-03-16 13:52:34 +00:00
Jacob Vosmaer 96ac302127 Fix golang shasum invocation 2016-03-16 13:41:07 +01:00
Jacob Vosmaer 25600f530f Update Git source installation steps to 2.7.3 2016-03-16 13:40:27 +01:00
Yorick Peterse af4d5458a9 Added an index on ci_runners.token
On PostgreSQL the index is created concurrently.

Fixes gitlab-org/gitlab-ce#14325
2016-03-16 13:38:47 +01:00
Daniel CarraroandRémy Coutable d6caadd1d5 Added omniauth-auth0 Gem + Applicable Documentation. 2016-03-16 13:12:20 +01:00
Achilleas Pipinellis a34021cd18 Merge branch 'doc-updates' into 'master'
Fix requirements.md link and improve PostgreSQL commands

 - Point requirements.md link to the correct location

 - Link to gitlab installation.md document instead of github

 - Use psql command switch to run specified SQL commands for creation of user and database permissions.
    -  Instead of requiring a comment like `# Do not type the 'template1=#', this is part of the prompt` it may be easier to just use the command switch with `psql` to execute the SQL commands.


*forgot [ci skip] :(*

See merge request !3176
2016-03-16 09:59:06 +00:00
Robert Speicher 374037b8a3 Merge branch 'issue_14306' into 'master'
Return an empty Array when there aren't lines to parse.

Fixes #14306

See merge request !3243
2016-03-16 01:29:09 +00:00
Douwe Maan c9c14584b7 Merge branch 'support-utf8-wiki-page-title' into 'master'
Support Wiki with UTF-8 page name

## What does this MR do?

Support Wiki with UTF-8 page name.

See https://github.com/gollum/gollum/pull/929

## Why was this MR needed?

Relax constraints for wiki slug in aac6598482.

It allows to create a wiki with UTF-8 name, but creating a wiki with UTF-8 name causes 500 error.

Creating a wiki with UTF-8 name once, then creating or updating wiki with ascii name also cause 500 error i.e. no one can create and update any wiki pages in the project.

## Workaround

1. Go to `https://DOMAIN/repo/wikis/git_access` -> this page display the link to git clone
2. Clone the wiki repo
3. Find the page with UTF-8 name
4. Rename or Delete these files
5. Commit and push

## What are the relevant issue numbers?

- #13979
- #13891
- #13698
- #13603
- #13317
- #12906
- #12825
- #10945 

## Todo

- [x] Waiting for 'gollum-rugged_adapter' that support rugged v0.24.0 release

'gollum-rugged_adapter' gem doesn't allow to install rugged v0.24.0 (it's still beta version),
but 'gitlab_git' gem depends on rugged v0.24.0b13.

So it can't install both 'gollum-rugged_adapter' and 'gitlab_git' now.


See merge request !2999
2016-03-16 01:21:34 +00:00
Douwe Maan f83a596db3 Merge branch 'worker-for-user-deletion' into 'master'
A worker deletes a user, so the request doesn't time out

Fixes #13261


See merge request !2855
2016-03-16 01:18:46 +00:00
Rubén Dávila 7e03b40221 Return an empty Array when there aren't lines to parse. 2016-03-15 19:51:27 -05:00
Robert Speicher 64d0dd1807 Merge branch 'fix-capybara-deprecation-warnings' into 'master'
Fix Capybara 2.6.2 deprecation warnings

See merge request !3236
2016-03-16 00:00:38 +00:00
Chris Wilson 24ea8d9df4 Use relative link for installation.md 2016-03-15 22:43:11 +00:00
Robert Speicher 5fd88cdd93 Merge branch 'git-2-7-3' into 'master'
Bump Git version requirement to 2.7.3

[ci skip]

See merge request !3240
2016-03-15 22:27:35 +00:00
Douwe Maan cd683714eb Fix changelog 2016-03-15 23:24:27 +01:00
Douwe Maan ecfa6cd75b Merge branch 'master' into git-2-7-3 2016-03-15 23:24:06 +01:00
Douwe Maan 7ae573c75a Bump Git version requirement to 2.7.3 2016-03-15 23:22:05 +01:00
Zeger-Jan van de Weg 29a43373ce Specs for the DeleteUserService 2016-03-15 22:19:51 +01:00
Zeger-Jan van de Weg 4827458155 Incorporate the review and update spec
The feature spec now also tests the absence of the new branch button
2016-03-15 21:59:25 +01:00
Robert Speicher a80b49ba1a Merge branch 'issue_14301' into 'master'
Fixes label on "Assignee" dropdown

Fixes #14301 

See merge request !3239
2016-03-15 20:41:54 +00:00
Jacob Schatz 495ae51353 Merge branch 'dropdown-vertical-spacing' into 'master'
Fixed overflow on users name in dropdowns

Closes #14289

![Screen_Shot_2016-03-15_at_17.38.09](/uploads/803341031c468069709afd99a6c540be/Screen_Shot_2016-03-15_at_17.38.09.png)

See merge request !3235
2016-03-15 20:18:56 +00:00
Alfredo Sumaran aff7c92596 Typo 2016-03-15 15:09:55 -05:00
Zeger-Jan van de Weg 8077a5f958 Clearify who deletes the user 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg a09323c9f5 Fix broken specs 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg 4231cfeba5 Target right release, rebase got it wrong 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg d249da1c16 Specs on force deleting of a user 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg b221d11a25 Add ability to delete a user with force 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg 4bcc097750 A worker deletes a user, so the request doesn't time out
Fixes #13261
2016-03-15 21:09:25 +01:00
connorshea e03d0b2892 Follow the CSS Style Guide rules for HEX colors.
Use lowercase letters and shorthand values for HEX colors where
possible.

Discussed in #14299.
2016-03-15 13:56:28 -06:00
Zeger-Jan van de Weg 2b97c92119 Incorporate review 2016-03-15 20:21:11 +01:00
Zeger-Jan van de Weg e831a3b869 Link in the note when started a new branch from an issue 2016-03-15 20:21:11 +01:00
Zeger-Jan van de WegandZeger-Jan van de Weg ad97bebfed Enhance new branch button on an issue 2016-03-15 20:21:11 +01:00
Zeger-Jan van de WegandZeger-Jan van de Weg 228007dfbc new-branch-button 2016-03-15 20:21:11 +01:00
Rémy Coutable bc590ce63b Merge branch '12743-subscribe-to-label' into 'master'
Allow subscribing to labels

This implement #12743 and supersedes !2799 (thanks @timothyandrew!).

- Subscribe (and unsubscribe) for labels
- When an issue/merge request is created, notify all subscribers of all its labels
- When an issue/merge request is edited, notify all subscribers of all its newly-added labels

## Done

- [x] Verify that a user is signed in to subscribe/unsubscribe from a label.
- [x] Merge conflicts
- [x] Integration tests
- [x] `issuable.subscribed?` should check subscribers and participants
- [x] When an issuable is relabeled, notify subscribers of the *newly added* labels only
- [x] Screenshots:

### Labels page

![Screen_Shot_2016-03-07_at_19.05.44](/uploads/3e69064e9e1a06ee2e27c778776c1407/Screen_Shot_2016-03-07_at_19.05.44.png)

### HTML email

![Screen_Shot_2016-03-07_at_19.07.36](/uploads/e484e06366a738385f1f6d71b52eecf7/Screen_Shot_2016-03-07_at_19.07.36.png)

### Plain text email

![Screen_Shot_2016-03-07_at_19.07.50](/uploads/dc05f710a8f7ab5eae9f72aa2110e741/Screen_Shot_2016-03-07_at_19.07.50.png)

PS: I've set the milestone to 8.6 since it's getting late for 8.5...

See merge request !3115
2016-03-15 18:08:45 +00:00
Stan Hu 7c61bdcf6f Fix Capybara 2.6.2 deprecation warnings 2016-03-15 11:03:17 -07:00
Phil Hughes b24f9d66bc Fixed overflow on users name in dropdowns
Closes #14289
2016-03-15 17:38:45 +00:00
Rémy Coutable e90d6ec1d8 Create a SentNotification record for #relabeled_issue_email / #relabeled_merge_request_email 2016-03-15 18:36:54 +01:00
Rémy Coutable c98089b2b2 Move the #toggle_subscription controller method to a concern 2016-03-15 18:22:03 +01:00
Rémy Coutable 54ec7e9599 Improving the original label-subscribing implementation
1. Make the "subscribed" text in Issuable sidebar reflect the labels
   subscription status

2. Current user mut be logged-in to toggle issue/MR/label subscription
2016-03-15 18:22:02 +01:00