home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,963 Commits 48 Branches 340 Tags
f680eca912f854373fc538ae1e9d0dcb60fcd310
Commit Graph
1690 Commits
Author SHA1 Message Date
Rémy Coutable 46ac3107a4 Merge branch 'issue_15557' into 'master' 
Fix error 500 when sorting issues by milestone due date and filtering by labels

fixes #15557 

See merge request !4327
 2016-06-01 08:42:36 +00:00
Felipe Artur 56f3b243ce Add leading comment space cop 2016-05-31 19:33:46 -03:00
Robert Speicher de20bd5b31 Merge branch 'rubocop/enable-space-before-comma-cop' into 'master' 
Enable Style/SpaceBeforeComma rubocop cop

No spaces before commas.

See #17478

See merge request !4360
 2016-05-30 18:22:48 +00:00
Robert Speicher e7586cfbdc Merge branch 'rubocop/enable-negatedif-style-cop' into 'master' 
Enable Style/NegatedIf Rubocop cop

Favor `unless` over `if` for negative conditions (or control flow ||).

```ruby
# bad
do_something if !some_condition
# bad
do_something if not some_condition

# good
do_something unless some_condition
# good
some_condition || do_something
```

See #17478

See merge request !4355
 2016-05-30 17:59:10 +00:00
Robert Speicher 6eaf327a57 Merge branch 'rubocop/enable-redundant-parentheses-cop' into 'master' 
Enable Style/RedundantParentheses rubocop cop

Checks for parentheses that seem not to serve any purpose.

See #17478 

See merge request !4361
 2016-05-30 17:20:56 +00:00
Grzegorz Bizon c370dce01c Enable Style/RedundantParentheses rubocop cop 
See #17478
 2016-05-30 15:07:18 +02:00
Grzegorz Bizon fdcb7e3685 Enable Style/SpaceBeforeComma rubocop cop 
No spaces before commas.

See #17478
 2016-05-30 14:51:42 +02:00
Grzegorz Bizon 53bf080f67 Enable Style/SpaceBeforeComment rubocop cop 
See #17478
 2016-05-30 14:36:28 +02:00
Grzegorz Bizon a55e8f109f Enable Style/NegatedIf Rubocop cop 
Favor `unless` over `if` for negative conditions
(or control flow ||).

See #17478
 2016-05-30 13:53:25 +02:00
Jacob Schatz 1a848d8354 Merge branch 'move-project-dropdown-async' into 'master' 
Loads move issue dropdown async

To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns.

![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif)

Closes #16563

See merge request !4160
 2016-05-26 18:28:01 +00:00
Yorick Peterse 9bdfc98242 Merge branch 'measure-proxy-timing' into 'master' 
Measure proxy flight time

See merge request !4278
 2016-05-26 17:05:26 +00:00
Jacob Vosmaer 5771114f9b Rename metric to 'rails queue duration' 2016-05-26 17:53:21 +02:00
Robert Speicher 8083bc234a Don't remove IDs via premailer 
This makes it easier to debug style rules.
 2016-05-25 16:56:06 -04:00
Robert Speicher 3e3463218d New confirmation email 🔥 2016-05-25 16:56:06 -04:00
Robert Speicher 2682c58847 Customize ActionMailer preview path 2016-05-25 16:56:06 -04:00
Jacob Vosmaer c049534da6 Align class name with field name 2016-05-25 14:55:23 +02:00
Jacob Vosmaer 897273d179 Couple ProxyTiming to Metrics middleware 2016-05-25 11:45:34 +02:00
Jacob Vosmaer cee07c5919 Measure proxy timing: needs influxdb code 2016-05-24 17:07:41 +02:00
Achilleas Pipinellis 26c768b42c Add proper config values for Registry in gitlab.yml 2016-05-22 14:54:29 -05: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
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 5c4416bb45 Loads move issue dropdown async 
Closes #16563
 2016-05-16 15:24:51 +01: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