home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,025 Commits 48 Branches 340 Tags
7ea60c8564b18788990ce8b45decd0932d71ba6e
Commit Graph
1458 Commits
Author SHA1 Message Date
Douwe Maan ad12f11f3e 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 08:11:02 +00:00
Robert Speicher ea4d2741a2 Merge branch 'patch-1' into 'master' 
Bug found by Charles Sibbald at Sky.

Calls with patricio and Jacob confirmed this.

[ci skip]

See merge request !2877
 2016-02-18 21:52:09 +00:00
Douwe Maan 873b0db220 Revert "Merge branch 'saml-decoupling' into 'master' " 
This reverts commit c04e22fba8, reversing
changes made to 0feab326d5.
 2016-02-18 22:14:53 +01:00
Douwe Maan 6524fbeaba Merge branch 'rs-sentry-release-tracking' into 'master' 
Add release tracking for Sentry



See merge request !2863
 2016-02-18 21:10:35 +00:00
Robert Speicher c04e22fba8 Merge branch 'saml-decoupling' into 'master' 
Decouple SAML authentication from the default Omniauth logic

Fixes gitlab-org/gitlab-ee#178

With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118

See merge request !2782
 2016-02-18 19:46:35 +00:00
Richard Pidgeon 5d2530f069 bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed this 2016-02-18 18:58:51 +00:00
Patricio Cano f014127e17 Decouple SAML authentication from the default Omniauth logic 2016-02-18 13:22:19 -05:00
Jacob Vosmaer 9805fe1914 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.
 2016-02-18 16:55:19 +01:00
Robert Speicher 6c9ae675b5 Add release tracking for Sentry 2016-02-17 14:05:58 -05:00
Robert Speicher fe13f58f3e Update Emoji asset path 
Now that we're serving assets directly from the Gemojione gem's path,
the images are not in an `emoji/` sub-folder.
 2016-02-12 15:34:20 -05: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
Douwe Maan b6ae2def2c Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' 
Unsubscribe from thread through link in email footer

Closes #3437 

![Screenshot_from_2015-12-11_15-35-06](/uploads/cfb3d8737d4757f527995411f103d0ce/Screenshot_from_2015-12-11_15-35-06.png)

![Screenshot_from_2015-12-11_15-35-56](/uploads/9b7121be7ce4b05e5995ca6d38c5bea4/Screenshot_from_2015-12-11_15-35-56.png)

See merge request !2068
 2016-01-14 14:38:55 +00:00