home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,219 Commits 48 Branches 340 Tags
b2dc9176018729efc1969035b30017c2ed81a708
Commit Graph
105 Commits
Author SHA1 Message Date
Connor Shea 18e16e427d Replace raphael-rails with raphael.js so it can be split from the rest of the JavaScript. The gem isn't maintained anymore anyway. Added a network folder with an application.js including raphael components, since that's the only page using it currently. 2016-06-10 09:28:07 -06:00
Connor Shea 026b7abc5a Attempt to fix the user page. 2016-06-01 19:42:49 -06:00
Connor Shea 0256e68399 Remove d3 except for on pages where it's necessary. 2016-06-01 19:42:49 -06:00
Robert Speicher 3e3463218d New confirmation email 🔥 2016-05-25 16:56:06 -04:00
Jeroen van Baarsen fa7a682bb0 Merge branch 'fix-generator-templates-directory' into 'master' 
Move generator templates to generator_templates/



See merge request !4217
 2016-05-19 21:24:05 +00:00
Yorick Peterse 9429da3ae2 Move generator templates to generator_templates/ 
Since we eager load everything in lib/ putting ERB code in .rb files
will result in syntax errors. By moving the templates to
./generator_templates we can work around this.
 2016-05-19 14:58:35 -05:00
Sean McGivern a9977f2b7a Syntax-highlight diffs in push emails 
Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
 2016-05-17 13:23:17 +01:00
Rémy Coutable 5589dcf8db Fix a few places where autoloading would fail 
- Fix naming of API::CommitStatuses
- Ensure we use require_dependency instead of require
- Ensure the namespace is right in lib/api/api.rb, otherwise, we
  might require Grape::API::Helpers which defines the `#params` method.
  This is to avoid requiring a file multiple times and getting an "Already
  initialized constant" error.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-10 11:51:19 +02:00
Stan HuandRémy Coutable 6da3388569 Add eager load paths to help prevent dependency load issues with Sidekiq workers 
Attempts to address #13521, #14825

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-10 11:51:19 +02:00
Connor Shea 8d3debe4cc Add more parameters to the filter_parameters config. 
Adds Sentry DSN, Webhooks, Deploy Keys, etc.

Alphabetized the parameters and included line breaks between each parameter. Easier to merge into EE if there are any differences.

This also seems to be the more popular syntax for adding new parameters, from what I can find.
 2016-04-29 18:44:49 -06:00
Jacob Vosmaer cf669551f6 Put CACHE_NAMESPACE in the Gitlab::Redis module 2016-04-07 15:42:07 +02:00
Jacob Vosmaer 0163e27631 Add Gitlab::Redis connection pool 2016-04-04 17:00:09 +02:00
Douwe Maan a8aa59e96e Inline mailer CSS using premailer. 
# Conflicts:
#	Gemfile.lock
 2016-03-19 20:04:10 +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
Jacob Vosmaer c46e6eff10 Parse config/resque.yml in one place only 2016-03-09 15:16:46 +01:00
Robert Speicher fcfdb23a23 Don't generate factories automatically 2016-03-04 15:26:51 -05:00
Artem Sidorenko 28ba8ed5f5 Use dedicated relative_url.rb initializer 
in order to have it the same way like in omnibus
 2016-02-29 21:17:48 +01:00
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
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 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
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
Achilleas Pipinellis b532109b97 Edit configuration files for relative URL support 
[ci skip]
 2016-02-09 16:59:42 +02: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
Valery SizovandValery Sizov 7f214cee74 Migrate mailers to ActiveJob 2015-11-26 17:03:43 +02:00
Robert Speicher 5e01e1bb90 Use methods: :any in our rack-cors configuration 
This was added in rack-cors 0.4.0 and allows all types of CORS requests
to the API.
 2015-10-07 22:08:37 -04:00
Jacob Vosmaer 82bb5c5e03 Expire Rails cache entries after two weeks 
This should help prevent endless Redis growth.
 2015-07-15 13:53:40 +02:00
Robert Speicher c40f59d04f Add otp_attempt to filtered parameters 2015-05-09 17:32:49 -04:00
Douwe Maan ca9aca9279 Allow smb:// links in Markdown text. 2015-03-10 13:32:28 +01:00
Douwe Maan 8d1fa44f23 Filter private_token and password_confirmation params from logs. 
Closes #1770.
 2015-02-06 22:55:43 +01:00
Fred Chasen 1f5ecf6c50 use new hash syntax 2015-01-23 15:33:20 -05:00
Fred Chasen 13c4e25d6f Split up line and use single qoutes to declare Cors settings 2015-01-23 15:30:48 -05:00
Fred Chasen 85b3c87b7f Expose Link header in CORS Api calls 2015-01-23 14:57:48 -05:00
Ciro Santilli 33c9f05c6b Append in place for strings and arrays 2015-01-01 21:12:00 +01:00
Dmitriy Zaporozhets 8e7fa0c2a1 Use new gitlab-shell v2.3.0 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-11-18 17:15:51 +02:00
Dmitriy Zaporozhets f7bf892cca Revert "gitlab shell works if multiple rubies installed" 
This reverts commit 533f4cdf30.
 2014-11-18 17:14:36 +02:00
Ciro Santilli 533f4cdf30 gitlab shell works if multiple rubies installed 
Before this it would fail because git hooks automatically prepend
things to the path, which can lead the wrong Ruby version to be called
in which dependencies are not installed.

To make sure that this is correct, the forked_merge_requests commented
out test that depends on this change was uncommented.

For that test to pass, it is also necessary to setup the mock server
on port 3001 under test_env.rb.
 2014-11-18 11:38:23 +01:00
Dmitriy Zaporozhets 59c25eb215 Merge pull request #8122 from bbodenmiller/cleanup-time-zone 
cleanup time zone settings
 2014-10-30 16:46:36 +02:00
Dmitriy Zaporozhets 3220e191ae Merge pull request #7994 from cirosantilli/rm-unneeded-autoload-path 
Remove unneeded app/finders config.autoload path
 2014-10-22 16:56:07 +03:00
Ben Bodenmiller 3dbe0810f5 cleanup time zone settings 
time zone settings moved to gitlab.yml in https://github.com/gitlabhq/gitlabhq/pull/8015
 2014-10-21 13:36:09 -07:00
Sullivan SENECHAL 593a287c8d Add timezone configuration to gitlab.yml 2014-10-21 11:27:16 +02:00
Ciro Santilli 10783f4d7b Remove unneeded app/finders config.autoload path 
Every directory under app/ is searched by default
 2014-10-07 23:41:02 +02:00
Dmitriy Zaporozhets d29cbc70b2 Remove I18n.enforce_available_locales deprecation message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-01 12:56:23 +03:00
Dmitriy Zaporozhets 38ed0deaac Move hook models in separate dir 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-15 11:31:30 +03:00
Dmitriy Zaporozhets c69b8e0459 Huge replace of old users_project and users_group references 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-14 19:32:51 +03:00
Jacob Vosmaer 185e7681d2 Move cache setup to config/application.rb 
Before this change we were trying to configure Rails.cache in an
initializer. It seems that by the time the initializers are loaded,
Rails.cache is already instantiated, so changing the settings does not
achieve anything anymore. This was causing Rails to default to a file
storage cache instead of the Redis cache, which in turn broke `rake
cache:clear`.
 2014-08-29 11:38:21 +02:00
Dmitriy Zaporozhets 1dab15940d Remove protected_atrributes gem and start moving to strong params 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 14:30:07 +03:00
Dmitriy Zaporozhets 2d87556847 Remove rails observers from application 2014-06-17 22:51:43 +03:00
Dmitriy Zaporozhets a90a201d0e Remove user observer 2014-06-17 22:32:35 +03:00
Dmitriy Zaporozhets a7d5052cd4 Remove SystemHook observer 2014-06-17 22:20:10 +03:00