home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,431 Commits 48 Branches 340 Tags
f04c5b27f0c19dfab00a6ac2de8b4168b67fe7a0
Commit Graph
1670 Commits
Author SHA1 Message Date
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
Douwe Maan 18ef054bc7 Merge branch '17464-backport-email-syntax-highlighting' into 'master' 
Syntax-highlight diffs in push emails

![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png)

Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151



See merge request !4147
 2016-05-19 21:12:53 +00:00
Douwe Maan bd0cecfdf6 Merge branch 'with-pipeline-view' into 'master' 
Add pipeline view

This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653

cc @DouweM @grzesiek 

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625


See merge request !3703
 2016-05-19 20:42:43 +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
Jacob Schatz 86b22b4f15 Merge branch 'project-variables-ui' into 'master' 
Project variables UI

![Screen_Shot_2016-04-27_at_09.01.23](/uploads/cb9b1ac42aa734cfd3271c03dfaccc12/Screen_Shot_2016-04-27_at_09.01.23.png)

![Screen_Shot_2016-04-27_at_09.01.29](/uploads/4f317014d60f205a0e29497ad20f8a2e/Screen_Shot_2016-04-27_at_09.01.29.png)

Closes #14091

See merge request !3942
 2016-05-19 18:09:04 +00:00
Stan Hu d46e47a5b6 Revert "Merge branch 'issues/15127' into 'master'" 
This reverts merge request !3647
 2016-05-19 14:09:24 +00:00
Stan Hu 3656b5db07 Merge branch 'issues/15127' into 'master' 
fix #15127 ActiveJob::DeserializationError thrown

`send_devise_notification` pre-maturely enqueued the task when the user instance
has not yet been committed into the database, causing a record-not-found in the
other sidekiq process.

`devise-async` has already been taking care of asynchronous mail sending, we just
need to run it inside queue `mailers` instead of `mailer` to enable it.

The implementation of `devise-async` enqueues the task in `after_commit` hook
which is the right way to do it.

See merge request !3647
 2016-05-19 06:12:34 +00:00
Kamil Trzcinski 2bea20b8ef Merge branch 'master' into docker-registry-view 2016-05-18 12:29:50 -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
Kamil Trzcinski 0a6c3494b0 Fix rubocop offenses 2016-05-16 23:32:55 -05:00
Yorick Peterse b933367ab3 Instrument all Grape API helpers 2016-05-17 00:16:49 +02:00
Kamil Trzcinski 89644edc4e Bring back path to registry settings 2016-05-16 17:15:38 -05:00
Kamil Trzcinski d0eb9438e9 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-05-16 17:13:14 -05:00
Kamil Trzcinski a26ec8a106 Compact host and port 2016-05-16 09:51:15 -05:00
Kamil Trzcinski 5b3ac8c83f Bring back port to registry configuration 2016-05-16 09:48:45 -05:00
Kamil Trzcinski 623102d455 Use registry.port to construct the registry host 2016-05-16 09:48:39 -05:00
Kamil Trzcinski 7257703388 Bring back port to registry configuration 2016-05-16 09:45:18 -05:00
Phil Hughes bda2c44a0b Project variables UI 
Closes #14091
 2016-05-16 10:21:51 +01:00
Kamil Trzcinski a77686d593 Merge branch 'docker-registry' into docker-registry-view 2016-05-14 14:05:57 -05:00
Kamil Trzcinski 4f1e0014a7 Simplify registry configuration 2016-05-14 14:03:41 -05:00
Kamil Trzcinski ecee057795 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-05-13 17:15:09 -05:00
Kamil Trzcinski f4f59d0f13 Merge branch 'docker-registry' into docker-registry-view 2016-05-13 17:15:01 -05:00
Kamil Trzcinski 0958f331d1 Merge remote-tracking branch 'origin/master' into docker-registry 
# Conflicts:
#	config/initializers/1_settings.rb
 2016-05-13 17:14:46 -05:00
Gabriel Mazetto 8d58e691c6 remove extra space to fix codestyle 2016-05-13 04:51:13 -03:00
Gabriel Mazetto f5a0ac0fc1 Codestyle: make sure we have space around operators 2016-05-13 04:46:56 -03:00
Robert Speicher 4735a75340 Merge branch 'deprecated-class-methods-cop' into 'master' 
Enable the Rubocop DeprecatedClassMethods cop

This reports uses of `File.exists?` and `Dir.exists?`, which were both
deprecated in Ruby and will eventually be removed in favor of `.exist?`.
Also fixes all existing uses of the deprecated methods.

See merge request !4087
 2016-05-12 22:41:01 +00:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route' 
# Conflicts:
#	db/schema.rb
 2016-05-12 16:39:03 -05:00
Kamil Trzcinski 4d84ba43d8 Merge branch 'docker-registry' into docker-registry-view 2016-05-12 12:48:41 -05:00
Kamil Trzcinski fc2d985bfa Fix CI tests 2016-05-12 12:47:55 -05:00
Jacob Schatz f2303f9df0 Merge branch 'send-incremental-build-log' into 'master' 
Update build log incrementally

Proof of concept implementation of incremental sending of build log to browser.

cc @jschatz1 @vsizov @grzesiek @tmaczukin 


See merge request !3737
 2016-05-12 16:48:42 +00:00
DJ Mountney c8f23bd2ed Support token header for health check token, and general cleanup of the health_check feature. 2016-05-11 17:27:08 -07:00
Douwe Maan f2251273b9 Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' 
Add snippet tab under user profile

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

See merge request !4001
 2016-05-11 22:04:25 +00:00
Rémy Coutable 941301339d Remove Rails monkey-patches now that we're using Rails 4.2.6 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-05-11 12:32:48 +02:00
Long Nguyen a22d559d27 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_snippets_tab_under_user_profile 2016-05-11 09:14:56 +07:00
Kamil Trzcinski db25c17036 Merge remote-tracking branch 'origin/master' into send-incremental-build-log 2016-05-10 13:58:10 -05:00
DJ Mountney 160ef66d1b Add health_check access token, and enforce on the health_check endpoint 
Also added a health check page to the admin section for resetting the token.
 2016-05-10 08:46:02 -07:00
DJ Mountney 9898f9b4e6 Set the standard health_check options to include the cache check. 2016-05-10 08:24:09 -07:00
DJ Mountney 67dc3b9c11 Add the health_check gem end expose the health_check route 2016-05-10 08:24:09 -07: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
Long Nguyen dd1ad6bf3e Code improve 2016-05-10 09:56:12 +07:00
Kamil Trzcinski 7c1acb022a Merge remote-tracking branch 'origin/master' into with-pipeline-view 
# Conflicts:
#	app/views/projects/ci/builds/_build.html.haml
#	app/views/projects/commit/_ci_commit.html.haml
#	app/views/projects/commit/_commit_box.html.haml
 2016-05-09 23:53:02 +03:00
Kamil Trzcinski 565a5e36fc Merge branch 'docker-registry' into docker-registry-view 2016-05-09 22:12:34 +03:00
Kamil Trzcinski 1dea54c220 Remove unused parts 2016-05-09 20:35:01 +03:00
Kamil Trzcinski 0094d8f196 Rename images to container_registry 2016-05-09 20:29:57 +03:00
Kamil Trzcinski 51a8811e26 Revert "Eager load lib/api" 
This reverts commit 0a280158ef.
 2016-05-09 20:26:14 +03:00
Kamil Trzcinski 71da2e0b56 Merge remote-tracking branch 'origin/master' into docker-registry 2016-05-09 20:21:02 +03:00
Kamil Trzcinski baef6728fa Send trace to a browser incrementally when build is running 
We send a state of ansi2html to client, client needs to send this state back.
The state describes the configuration of generator and position within trace.
 2016-05-09 19:59:45 +03:00
Dmitriy Zaporozhets 90ae445ba9 Merge branch 'rs-remove-wall_enabled' into 'master' 
Remove `wall_enabled` field from Project



See merge request !4089
 2016-05-09 10:02:59 +00:00
Rémy Coutable 7d95d3cde7 Merge branch 'trusted-proxies-ip-addr' into 'master' 
Pass trusted_proxies to action_dispatch as IPAddrs instead of strings

Without this setting your own trusted_proxies does not work.

Fixes an issue introduce in: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3524

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17004

See merge request !3970
 2016-05-09 09:47:16 +00:00