Commit Graph
1541 Commits
Author SHA1 Message Date
Robert Speicher 955d027d17 Merge branch 'rs-update-rails' into 'master'
Bump rails to 4.2.6

See merge request !3424
2016-04-09 04:07:48 +00:00
Robert Speicher 93571c4335 Merge branch 'redis-connection-pool' into 'master'
Redis connection pool

Split from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3232

Having an easily accessible Redis connection pool allows us to do more
cool stuff with Redis in GitLab (instead of having to go through e.g.
the Rails cache).

See merge request !3521
2016-04-08 22:26:53 +00:00
Yorick Peterse c56f702ec3 Instrument Rails cache code
This allows us to track how much time of a transaction is spent in
dealing with cached data.
2016-04-08 17:54:52 +02:00
Jacob Vosmaer cf669551f6 Put CACHE_NAMESPACE in the Gitlab::Redis module 2016-04-07 15:42:07 +02:00
Jacob Schatz 0bbeebc8f9 Remove dumb debug statement and add many tests. 2016-04-07 08:47:29 -04:00
Jacob Schatz 8172d2c1f2 Add optional colon. 2016-04-07 08:17:05 -04:00
Rémy Coutable 8eae7b1088 Merge branch 'feature/expose-builds-badge' into 'master'
Expose badges

This MR exposes badge somewhere in visible place.

![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png)

Closes #13801

See merge request !3326
2016-04-07 08:40:15 +00:00
Robert Speicher 936be025cd Merge branch 'saml-external-groups' into 'master'
Allow SAML to identify external users and set them as such

Related to #4009

Fixes #14577

This allows SAML to retrieve group information form the `SAML Response`
and match that to a setting that will flag all matching users as external.

See merge request !3530
2016-04-07 00:35:08 +00:00
Robert Speicher 730625f022 Merge branch 'patch/fix-markdown-preview-wikis' into 'master'
Wiki preview URL converting problem [via Markdown]

Current implementation when rendering the preview, thinks relative links are for project repository files.

We are creating a new preview route that will define correct context data to render for wikis instead.

Fixes #2380, #1184

See merge request !3461
2016-04-07 00:17:21 +00:00
Patricio Cano b95ac0962c Added documentation 2016-04-06 16:04:11 -05:00
Grzegorz Bizon 88fc7ccdda Add project badges view prototype 2016-04-06 19:56:34 +02:00
Grzegorz Bizon ea69037831 Improve routes for project badges 2016-04-06 19:56:34 +02:00
Robert Speicher ee1de011d1 Premailer shouldn't remove script tags from our emails
Closes #14943.
2016-04-05 17:03:34 -04:00
Robert Speicher 5ff9d2a182 Bump rails to 4.2.6 2016-04-05 13:07:53 -04:00
Patricio Cano 943d8d4b90 Config examples 2016-04-04 19:10:17 -05:00
Jacob Vosmaer 0163e27631 Add Gitlab::Redis connection pool 2016-04-04 17:00:09 +02:00
connorshea 85cc172959 Remove "Congratulations!" tweet button on newly-created project.
I’ve removed everything related to the feature based on this commit:
ce08f919f34fd8849834365

Resolves #10857.
2016-03-31 17:09:36 -06:00
Gabriel Mazetto b69f8a62b2 Add specific markdown_preview route for Wikis 2016-03-30 15:04:58 -03:00
Rémy Coutable 9f218fc184 Improve and finish the fallback to the In-Reply-To and References header for the reply-by-email feature
A few things to note:
- The IncomingEmail feature is now enabled even without a
  correctly-formatted sub-address
- Message-ID for new thread mail are kept the same so that subsequent
  notifications to this thread are grouped in the thread by the email
  service that receives the notification
  (i.e. In-Reply-To of the answer == Message-ID of the first thread message)
- To maximize our chance to be able to retrieve the reply key, we look
  for it in the In-Reply-To header and the References header
- The pattern for the fallback reply message id is "reply-[key]@[gitlab_host]"
- Improve docs thanks to Axil
2016-03-25 13:05:15 +01:00
Douwe Maan 30246f1dc2 Merge branch 'rs-rails-routes' into 'master'
Add special cases for built-in Rails routes in development



See merge request !3369
2016-03-23 18:33:48 +00:00
Rémy Coutable 7dc16346bb Fix an issue causing the Dashboard/Milestones page to be blank 2016-03-23 12:02:15 +01:00
Robert Speicher 19a2adfa0c Add special cases for built-in Rails routes in development 2016-03-22 20:26:57 -04:00
Zeger-Jan van de Weg 6e5461c6ee Merge branch 'master' into 2489-soft-delete-issues 2016-03-21 19:32:37 +01:00
Rémy Coutable 17de30f412 Merge branch 'backport-ee-premailer' into 'master'
Backport premailer and diff changes from EE

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151

See merge request !3318
2016-03-21 10:46:37 +00:00
Zeger-Jan van de Weg 212e83bab3 Soft delete issuables 2016-03-19 21:23:03 +01:00
Douwe Maan a8aa59e96e Inline mailer CSS using premailer.
# Conflicts:
#	Gemfile.lock
2016-03-19 20:04:10 +01:00
Rémy Coutable cafa408b25 Merge remote-tracking branch 'origin/master' into remove-wip 2016-03-18 23:29:18 +01:00
Phil Hughes d847db79cb Fixes issue on dashboard issues
They would try to load JSON from a project even though it isn't a single project
2016-03-18 15:18:06 +00:00
Daniel CarraroandRémy Coutable d6caadd1d5 Added omniauth-auth0 Gem + Applicable Documentation. 2016-03-16 13:12:20 +01: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
Hiroyuki Sato 8acad49fe0 Support Wiki with UTF-8 page name 2016-03-16 02:17:07 +09:00
Timothy AndrewandRémy Coutable 0444fa560a Original implementation to allow users to subscribe to labels
1. Allow subscribing (the current user) to a label

- Refactor the `Subscription` coffeescript class
  - The main change is that it accepts a container, and conducts all
    DOM queries within its scope. We need this because the labels
    page has multiple instances of `Subscription` on the same page.

2. Creating an issue or MR with labels notifies users subscribed to those labels

- Label `has_many` subscribers through subscriptions.

3. Adding a label to an issue or MR notifies users subscribed to those labels

- This only applies to subscribers of the label that has just been
  added, not all labels for the issue.
2016-03-15 17:25:37 +01:00
Robert Speicher 90e91e28e4 Merge branch 'application-settings' into 'master'
Applications tab on profile settings

Closes #13855

See merge request !3031
2016-03-15 14:33:14 +00:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master'
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
2016-03-14 16:38:52 +00:00
Robert Speicher 8f21e2ae40 Let oauth/applications#index handle the profiles#applications route
Previously we were doing all of kinds of code gymnastics and flash abuse
in order to work with a Doorkeeper controller but have it _appear_ at
the `/profile/applications` path. Fortunately we can just tell Rails to
use a different controller to handle that route, and we get the best of
both worlds.
2016-03-13 16:51:09 -04:00
Stan Hu 74d7de8196 Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""
This reverts commit 5a586f364c
2016-03-12 21:05:23 +00:00
Douwe Maan 5a586f364c Revert "Merge branch 'support-go-subpackages' into 'master' "
This reverts merge request !3191
2016-03-12 17:42:51 +00:00
Douwe Maan 826bc72c12 Merge branch 'support-go-subpackages' into 'master'
Support Golang subpackage fetching

Closes #13805

See merge request !3191
2016-03-12 17:38:08 +00:00
Douwe Maan f979b4a2c8 Merge branch 'filter-import-url' into 'master'
Filter import_url params because they may contain auth information. Fixes #14199

cc @dzaporozhets @DouweM tagging you since this is security related.

See merge request !3174
2016-03-12 14:08:48 +00:00
Stan Hu cc065fbeaa Support Golang subpackage fetching
Closes #13805
2016-03-12 01:09:37 -08:00
Douwe Maan cb81c8a5ef Merge branch 'rs-issue-12944' into 'master'
Use a custom Devise failure app to handle unauthenticated .zip requests

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944

See merge request !2828
2016-03-11 22:34:33 +00:00
Yorick PeterseandRobert Speicher 12082db41e Disable Rubocop for PostgreSQL patches
This code is mostly a copy-paste from existing pull requests so there's
no point in running Rubocop on it.
2016-03-11 15:25:23 -05:00
Yorick PeterseandRobert Speicher d38dcf1e3b Patch MySQL to ignore PostgreSQL schema options
This ensures that options such as `using: :gin` and PostgreSQL operator
classes are ignored when loading a schema into a MySQL database.
2016-03-11 15:25:22 -05:00
Yorick PeterseandRobert Speicher 49e122df85 Backport Rails support for PostgreSQL opclasses
This is needed to support creating/dumping/loading indexes that use the
gin_trgm_ops operator class on PostgreSQL. These changes are taken from
Rails pull request https://github.com/rails/rails/pull/19090.
2016-03-11 15:25:22 -05:00
Robert Speicher ee14ac68a5 Merge branch 'group-activity-separate-tab' into 'master'
Move group activity feed to separate page for consistency with dashboard
and project pages

Fixes #14161. Part of #13480 

See merge request !3157
2016-03-11 19:58:10 +00:00
Dmitriy Zaporozhets 746ac56b6f Add functionality to setup share of project with group via project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-11 18:37:46 +01:00
Josh Frye 36ddca101e Filter import_url params because they may contain auth information. Fixes #14199 2016-03-10 21:22:46 -05:00
Dmitriy Zaporozhets e3efce9237 Move group activity feed to separate page for consistency with dashboard and project pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10 14:29:38 +01:00
Jacob Vosmaer c46e6eff10 Parse config/resque.yml in one place only 2016-03-09 15:16:46 +01:00
Robert Speicher 5844a21a0a Use a custom Devise failure app to handle unauthenticated .zip requests
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
2016-03-08 23:49:30 -05:00