Commit Graph
1459 Commits
Author SHA1 Message Date
Jacob Vosmaer 73c777cf67 Backport ExclusiveLease to 8.5 2016-03-11 13:38:58 +01:00
Douwe MaanandRémy Coutable 58e247d83b Merge branch 'rel-url-fix' into 'master'
Fix relative URL

See https://github.com/gitlabhq/gitlabhq/issues/10053

 1. Same configuration way for relative URL like with Omnibus
 2. Loading the relative configuration from Rakefile as Rails do not load initializers for `asset:precompile`

First point has another positive side effect: no collisions (due to git controlled `application.rb`) any more during the upgrades of source based installations and relative url configuration

 - [x] tests on the source based installation
 - [x] tests on the centos&ubuntu omnibus packages

Fixes: gitlab-org/gitlab-ce#13730, gitlab-org/gitlab-ce#13727, gitlab-org/omnibus-gitlab#1143 and https://github.com/gitlabhq/gitlabhq/issues/10053

See merge request !2979
2016-03-01 17:37:51 +01:00
Douwe MaanandRémy Coutable 5a3c5ace67 Merge branch '11489-branded-appearance-to-ce' into 'master'
Branded appearance to CE

Closes #11489

The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too.

TODO:
- [x] Copy docs
- [x] Make new screenshots
- [ ] Remove Custom Welcome message feature?

@rymai: I was unsure what labels to add to ping you, so I just ping you like this 😉

/cc @DouweM

See merge request !2927
2016-03-01 11:41:03 +01:00
Rémy Coutable 25b7a1ce81 Merge branch 'bring-back-newrelic-gem' into 'master'
Revert "Remove newrelic gem. Closes #12860"

This reverts commit 531767175f.

Conflicts:
	Gemfile.lock

See merge request !2943
2016-02-24 09:23:30 +01:00
Douglas Barbosa AlexandreandRémy Coutable 41f1b3dede Merge branch 'tasks' into 'master'
Add Todos

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

Tasks:

-  Prepare database
 - [X] Create a new table (`todos`)
- Tasks Queue view
 - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page
 - [X] Add a chronological list of todos, with the 'Todos' tab active by default
 - [X] Add a 'Done' button to each todo
 - [x] Add filters (project, author, type, and action)
- Todos generation
 - [X] When user issue/mr is assgined to someone
 - [x] When user is mentioned on (issues/mr's/comments)
- Mark todo as `done`
 - [X] When clicks on the 'Done' button
 - [X] When edit issue/mr
 - [X] When left/edit a comment
 - [X] When reassign issue/mr
 - [X] When add/remove labels to issue/mr
 - [X] When issue/mr is closed
 - [X] When mr is merged
 - [X] When added an emoji
 - [X] When changed the issue/mr milestone

* Screenshot:

![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png)

See merge request !2817
2016-02-22 08:47:44 +01:00
Robert SpeicherandRémy Coutable 0daef5bfd7 Merge branch 'issue_3409' into 'master'
Add ability to revert changes introduced by Merge Requests or Commits

Closes #3409 

See merge request !1990
2016-02-19 19:55:19 +01:00
Grzegorz BizonandRémy Coutable 62067b74c8 Merge branch 'ci/remove-builds' into 'master'
Make it possible to erase build content (artifacts, trace)

This feature makes it possible to remove build content - build artifacts and build traces.

- [x] Remove artifacts
- [x] Remove metadata
- [x] Remove build traces
- [x] Wait for https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 this to be merged
- [x] Fix the permissions after the merge

Closes #3421

See merge request !2560
2016-02-19 18:22:49 +01:00
Patricio CanoandRémy Coutable c1921fb510 Merge branch 'saml-decoupling' into 'master' 2016-02-19 16:45:18 +01:00
Douwe MaanandRémy Coutable da0953e652 Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness 

Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)

See merge request !2800
2016-02-19 16:29:55 +01:00
Douwe MaanandRémy Coutable 6eacfa9986 Merge branch 'rs-sentry-release-tracking' into 'master'
Add release tracking for Sentry



See merge request !2863
2016-02-19 16:26:06 +01:00
Robert SpeicherandRémy Coutable 10354f7a58 Merge branch 'cache-clear' into 'master'
Use SCAN during 'rake cache:clear'

This allows 'rake cache:clear' to delete millions of keys without
choking. It requires Redis 2.8.0 or newer but we needed that already
anyway.

See merge request !2872
2016-02-19 16:25:23 +01:00
Grzegorz Bizon 28b11963b1 Move builds badge implementation to new badges controller 2016-02-11 10:29:15 +01:00
Grzegorz Bizon 7e1453f2f0 Fix rubocop offence in routes for build badge 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 52352dccc3 Move badge implementation to builds controller 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 442a49db2b Skip authentication when requesting commit status badge 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 28c4c949a5 Improve CI status badge implementation 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 14f928b730 Add CI status badge implementation to commit controller 2016-02-11 10:29:14 +01:00
Achilleas Pipinellis 10aa99a30c Merge branch 'doc_relative_url' into 'master'
Add documentation on relative URL support

closes #12773

See merge request !2770
2016-02-10 10:51:18 +00:00
Achilleas Pipinellis 464cea7d48 Fix typos and grammar
[ci skip]
2016-02-10 12:43:19 +02:00
Dmitriy Zaporozhets 22808a2221 Merge branch 'fix-explore-filter' into 'master'
Add ajax filtering to all paged project lists. Fixes #13182



See merge request !2728
2016-02-10 08:31:36 +00:00
Robert Speicher 4317b22741 Merge branch 'variables-build-log' into 'master'
Add notice about variables in build log

Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942

[ci skip]

See merge request !2761
2016-02-09 21:34:46 +00:00
Douwe Maan d77c3cff36 Merge pull request #10023 from bozaro/smtp-port
Change default smpt port to 465 (default smtps port)
2016-02-09 17:22:47 +01:00
Josh Frye 8b4e9720d9 Extract events rendering to own action. 2016-02-09 10:10:41 -05:00
Achilleas Pipinellis b532109b97 Edit configuration files for relative URL support
[ci skip]
2016-02-09 16:59:42 +02:00
Artem V. Navrotskiy e080fdad6e Change default smpt port to 465 (default smtps port) 2016-02-09 07:30:06 +03:00
Kamil Trzcinski 4558bb1f4a Filter out variables from production logs
This prevents leakage of CI Secure Variables
2016-02-09 00:44:27 +01:00
Robert Speicher 89b3ddd609 Allow limited Markdown in Broadcast Messages
Closes #11853
2016-02-06 14:30:07 -05:00
Josh Frye 531767175f Remove newrelic gem. Closes #12860 2016-02-03 09:22:21 -05:00
Rémy Coutable c1faa836f6 Merge branch 'improve-environment-variables-doc' into 'master'
Improving the "Environment variables" administration doc

Closes #12829.

/cc @sytses 

See merge request !2669
2016-02-03 13:47:19 +00:00
Stan HuandDouglas Barbosa Alexandre d20e75a8d8 Support Akismet spam checking for creation of issues via API
Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612
2016-02-02 11:25:44 -02:00
Rémy Coutable 06c0025f16 Improving the "Environment variables" administration doc 2016-02-01 19:10:46 +01:00
Yorick Peterse 33fb55a572 Instrument various Rugged constants 2016-02-01 15:03:58 +01:00
Yorick Peterse 1256dabb44 Instrument all Gitlab::Git instance methods 2016-02-01 13:54:39 +01:00
Robert Speicher d97742570f Increase the minimum length for commit SHA matching to 7
This is the git default and will help to prevent false positive matches.

Closes #12706
2016-01-29 19:52:29 -05:00
Robert Speicher 79123ec998 Revert "Revert "Remove the :coffee and :coffeescript Haml filters""
This reverts commit b0145d765b.
2016-01-28 14:29:09 -05:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master'
Show list of forks for a given Project

Closes #2406

See merge request !2376
2016-01-28 16:58:38 +00:00
Blake Hitchcock 4be65c3231 Update ExternalIssue regex for JIRA integration
The pattern in the `::reference_pattern` class method in the
ExternalIssue model does not match all valid forms of JIRA project
names. I have updated the regex to match JIRA project names with numbers
and underscores. More information on valid JIRA project names can be
found here:
https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html

* The first character must be a letter,
* All letters used in the project key must be from the Modern Roman Alphabet and upper case, and
* Only letters, numbers or the underscore character can be used.
2016-01-26 15:55:40 -05:00
Valery Sizov 446fed4d83 monkey patch for mysql 5.7 2016-01-25 16:52:00 +02:00
Yorick Peterse 7d1b51fac1 Instrument Gitlab::Git::Repository
This adds instrumentation for the instance methods of
Gitlab::Git::Repository.
2016-01-21 11:27:31 +01:00
Dmitriy ZaporozhetsandJacob Schatz 8367e4abeb Implement new UI for pagination 2016-01-20 21:27:01 -05:00
Jeroen Nijhof 7a609858f0 Use sentry in env production only 2016-01-20 09:48:38 +01:00
Jeroen Nijhof 7658a64469 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into sentry-integration
Conflicts:
	db/schema.rb
2016-01-20 09:07:10 +01:00
Rubén Dávila 7765ce1875 Setup new fork link in sidebar and routes. #2406 2016-01-20 00:14:58 -05:00
Douglas Barbosa Alexandre 96440042a9 Raise an error on page load if there are pending migrations on dev env 2016-01-19 00:12:30 -02:00
Jeroen Nijhof 85e0fce9ee Add sentry integration 2016-01-18 17:15:10 +01:00
Rémy Coutable 2723dea667 Ensure Gravatar host looks like an actual host 2016-01-18 14:58:16 +01:00
Yorick Peterse 8c4210e676 Added metrics instrumentation for all finders 2016-01-18 11:54:22 +01:00
Jacob Vosmaer 5cb321c853 Merge branch 'no-mail-during-dev-bootstrap' into 'master'
Don't send (fake) email during dev bootstrap

This allows you to do:

    rake dev:setup BOOTSTRAP=1

and prevent dozens of letter_opener email popups in your browser.

In the latest GDK we automatically set BOOTSTRAP=1 during `make`.

[ci skip]

See merge request !2447
2016-01-15 14:47:29 +00:00
Jacob Vosmaer 4da7547b6d Don't send (fake) email during dev bootstrap
This allows you to do:

    rake dev:setup BOOTSTRAP=1

and prevent dozens of letter_opener emai popups in your browser.
2016-01-15 13:15:24 +01:00
Douwe Maan b6454fef56 Merge branch 'import-gh-wiki' into 'master'
Import GitHub wiki into GitLab

Closes #2834 

GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported.

Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags.

##### Before `WikiPipeline`:

![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png)

##### After `WikiPipeline`:

![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png)

See merge request !2324
2016-01-14 15:08:42 +00:00