Commit Graph
19554 Commits
Author SHA1 Message Date
Douwe Maan e2f93d2ea1 Merge branch 'master' into ldap-sync-group-members 2015-07-31 23:55:42 +02:00
Robert Speicher adbaa5c424 Merge branch 'ce-to-ee' into 'master'
CE to EE

See merge request !468
2015-07-31 21:53:23 +00:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Douwe Maan 2472147fe0 Merge branch 'master' into ldap-sync-group-members 2015-07-31 16:04:24 +02:00
Douwe Maan bdb4288ab8 Merge branch 'mention-name-in-flash-msg' into 'master'
Mention group and project names in flash messages upon create, update and delete.

Mention group and project names in flash messages upon create, update and delete. I also changed some wording inconsistency.

**Before**

![project_created](https://gitlab.com/axil/gitlab-ce/uploads/b91b92e46b08d6c566acee8d88fccff1/project_created.png)

**After**

![project_created_after](https://gitlab.com/axil/gitlab-ce/uploads/56db5125f2769386c43cf9e2f175a54d/project_created_after.png)

See merge request !1070
2015-07-31 13:29:38 +00:00
Douwe Maan 3307008499 Merge branch 'admin-group-member' into 'master'
Add specific ability for managing group members

To be used for https://dev.gitlab.org/gitlab/gitlab-ee/issues/290 (Internal issue)

See merge request !1059
2015-07-31 13:25:53 +00:00
Douwe Maan 7a048cf4bf Merge branch 'fix-multiline-comment-highlighting' into 'master'
Fix multi-line syntax highlighting

### What does this MR do?

This MR fixes multi-line syntax highlighting in the code views. HTML span elements only apply to a single line, and in the case of multi-line comments, the highlighting was dropped as a result. Ensure that each line has
the proper styling to fix this.

### Why was this MR needed?

The current styling was broken for a while.

### Screenshots

Before:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/bbcb61760ab04a010aabc40942a2c0ba/image.png)

After:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/48f61c91b6fdd9c99cd7f3d214853141/image.png)

### What are the relevant issue numbers?

Closes #1577
Closes #1495

See merge request !1079
2015-07-31 12:45:42 +00:00
Douwe Maan 0736f348a6 Use before_actions 2015-07-31 14:15:49 +02:00
Stan Hu 0abe98f049 Fix multi-line syntax highlighting
HTML span elements only apply to a single line, and in the case of multi-line
comments, the highlighting was dropped as a result. Ensure that each line has
the proper styling to fix this.

Closes #1577
2015-07-30 22:37:53 -07:00
Robert Speicher a51a3fb8ed Merge branch 'rs-mr-1050-followup' into 'master'
Add spec to RelativeLinkFilter for Unicode filenames

Adds specs for changes added in !1050

See merge request !1078
2015-07-31 01:47:41 +00:00
Robert Speicher 327013ace9 Merge branch 'rs-markdown-feature-pipelines' into 'master'
Prepare Markdown feature spec for testing multiple pipelines

This MR lays the groundwork for including or excluding certain HTML::Pipeline
filters depending on what we're parsing. For example, excluding reference
filters in the Issues and Merge Requests titles.

See merge request !1053
2015-07-31 01:35:02 +00:00
Robert Speicher a876db48d9 Merge branch 'api-new-attributes' into 'master'
Add project star and fork count, group avatar URL and user/group web URL attributes to API

Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2521.

See merge request !1058
2015-07-30 21:38:48 +00:00
Robert Speicher 7ca7770e98 Fix CHANGELOG entry 2015-07-30 17:27:25 -04:00
Robert Speicher 4e22dcb6a3 Add spec to RelativeLinkFilter for Unicode filenames 2015-07-30 17:25:07 -04:00
Robert Speicher 6d6f807b75 Merge branch 'fix-image-file-is-not-displayed' into 'master'
Update RelativeLinkFilter to support non-ASCII filenames

See merge request !1050
2015-07-30 21:24:13 +00:00
Stan Hu bd72b5bd32 Fix version for CHANGELOG entry 2015-07-30 13:40:30 -07:00
Stan Hu fcf8a6482f Merge branch 'backup-directory-permissions' into 'master'
Backup directory permissions

This sidesteps problems with running 'chmod' on some CIFS mounts.

Closes #1704 
https://gitlab.com/gitlab-org/gitlab-ce/issues/1704

See merge request !1065
2015-07-30 14:11:41 +00:00
Jacob Vosmaer c13e2290bc Merge branch 'fix-rake-check-hooks' into 'master'
Check that hooks directory exists before attempting to call realpath

This MR checks that the hooks directories actually exist before attempting to resolve their `realpath`.

Users who attempted to restore from source to an omnibus installation would get ugly errors when running `gitlab-rake gitlab:check`:

```
Errno::ENOENT: No such file or directory @ realpath_rec - /var/opt/gitlab/git-data/repositories/Wanda/www.git/hooks
/opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `realpath'
/opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:488:in `block in check_repos_hooks_directory_is_link'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block (2 levels) in find_each'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `each'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:52:in `block in find_each'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:126:in `find_in_batches'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/relation/batches.rb:51:in `find_each'
/opt/gitlab/embedded/service/gem/ruby/2.1.0/gems/activerecord-4.1.11/lib/active_record/querying.rb:9:in `find_each'
/opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:482:in `check_repos_hooks_directory_is_link'
/opt/gitlab/embedded/service/gitlab-rails/lib/tasks/gitlab/check.rake:343:in `block (3 levels) in <top (required)>'
Tasks: TOP => gitlab:check => gitlab:gitlab_shell:check
```

Closes #2121

#2082

See merge request !1068
2015-07-30 14:07:59 +00:00
Stan Hu ee17102848 Check that hooks directory exists before attempting to call realpath
Closes #2121
2015-07-30 06:53:23 -07:00
Achilleas Pipinellis feb2865fba Raise alert when group is deleted.
This change was made to match the project deletion.
2015-07-30 14:11:26 +03:00
Douwe Maan 2a60b8006b Fix Project 2015-07-30 12:35:09 +02:00
Douwe Maan b8066e2cd0 No more web url 2015-07-30 11:56:15 +02:00
Douwe Maan 1e4b326463 Merge branch 'fix-single-quote-in-network-graph' into 'master'
Fix network graph when branch name has single quotes

## Steps to reproduce

1. Create a branch with a single quote in the branch name: "`test`"
2. Look at Project's Network view

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

See merge request !1063
2015-07-30 09:39:28 +00:00
Job van der Voort ae36842d45 Merge branch 'ssh-key-form' into 'master'
Switched the order of the SSH key form

Now it looks like this:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/dca3353266e93cec9cfd9f2f16af8657/image.png)


See merge request !1069
2015-07-30 09:26:56 +00:00
Jacob Vosmaer baa157926d Stricter mkdir's in 'rake gitlab:backup:create' 2015-07-30 10:17:34 +02:00
Marin Jankovski eb86e3ed46 Merge branch 'fix-rake-import-check' into 'master'
Check that project was actually created rather than just validated in import:repos task

Add gitlab-shell to error message to give user a clue that something may be wrong there.

Ran into this in #2082. User was told that repositories were created when they were
not due to `hooks` symlink being wrong.

See merge request !1039
2015-07-30 08:13:18 +00:00
Stan Hu 6b5551d994 Merge branch 'typo-corrections' into 'master'
Minor styling fixes

- Link to rendered html instead of markdown source.
- Removed typos

See merge request !1044
2015-07-30 06:39:12 +00:00
Stan Hu 369275d630 Fix network graph when branch name has single quotes
Closes https://github.com/gitlabhq/gitlabhq/issues/9500
2015-07-29 23:29:47 -07:00
Achilleas Pipinellis c63f1486db Merge branch 'omniauth-twitter' into 'master'
Updated Twitter OmniAuth documentation

See merge request !1071
2015-07-30 06:01:43 +00:00
Raphaël Doursenaud 725a891dda Updated Twitter OmniAuth documentation 2015-07-29 23:27:04 +00:00
Achilleas Pipinellis 0fac66f84d Mention group and project name in flash messages upon create, update and delete. 2015-07-30 01:22:16 +03:00
Robert Speicher 4af981705b Merge branch 'admin-emails-delayed' into 'master'
Don't resend admin email to everyone if one delivery fails

Fixes gitlab/gitlabhq#2524

See merge request !462
2015-07-29 21:34:04 +00:00
Robert Speicher 8e01b8368a Merge branch 'ldap-sync-notifications' into 'master'
Don't send "Added to group" notifications when group is LDAP synched

Addresses gitlab/gitlab-ee#313.

See merge request !463
2015-07-29 21:18:36 +00:00
Darby 34c2867ca2 Switched the otder of the SSH key form 2015-07-29 12:59:50 -07:00
Stan Hu 3e9b612306 Check that project was actually created rather than just validated in import:repos task
Add gitlab-shell to error message to give user a clue that something may be wrong there.

Ran into this in #2082. User was told that repositories were created when they were
not due to hooks symlink being wrong.
2015-07-29 10:49:13 -07:00
Stan Hu 82f0d3e655 Merge github.com:gitlabhq/gitlabhq 2015-07-29 06:21:00 -07:00
Stan Hu 4c602b42af Merge pull request #9489 from dvrylc/fix-login-field
Disabled autocapitalize and autocorrect on login field
2015-07-29 06:14:29 -07:00
Douwe Maan 4af9847618 Fix specs 2015-07-29 15:01:13 +02:00
Douwe Maan 1afb0faa41 Satisfy Rubocop 2015-07-29 13:28:11 +02:00
Douwe Maan 72c552c2d4 Fix specs 2015-07-29 13:23:28 +02:00
Douwe Maan 76b3e44c39 Merge branch 'master' into api-new-attributes 2015-07-29 12:39:44 +02:00
Douwe Maan d953f6927c Restore Leave button on dashboard groups page 2015-07-29 12:15:21 +02:00
Douwe Maan 05cca9342b Use URL helpers 2015-07-29 12:03:53 +02:00
Valery Sizov a06827bff9 Merge branch 'update_chnagelog' into 'master'
Update chnagelog



See merge request !1064
2015-07-29 09:30:20 +00:00
Valery Sizov 545f389910 update changelog 2015-07-29 12:28:50 +03:00
Valery Sizov 8bda433734 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-07-29 12:19:59 +03:00
Valery Sizov 81c71d2519 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-29 12:19:37 +03:00
Douwe Maan d64ae5363f Merge branch 'soft-launch-gitlab-git-http-server' into 'master'
Experimental support for gitlab-git-http-server

https://gitlab.com/gitlab-org/gitlab-git-http-server

This change introduces the GITLAB_GRACK_AUTH_ONLY environment
variable. When set, Grack requests to GitLab will only respond with
the user's GL_ID (if the request is OK) or an error. This allows
gitlab-git-http-server to use the main GitLab application as an
authentication and authorization backend.

If we like how this works we should drop the GITLAB_GRACK_AUTH_ONLY
variable at some point in the future.

See merge request !1915
2015-07-29 09:19:25 +00:00
Jacob Vosmaer c5aae30773 Set internal backup directory modes on create
This sidesteps problems with running 'chmod' on some CIFS mounts.
2015-07-29 11:18:55 +02:00
Daryl Chan e72a9685f3 Added tags to disable autocapitalize and autocorrect on login field
- Updated CHANGELOG
2015-07-29 15:42:52 +08:00