home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
29,470 Commits 48 Branches 340 Tags
a0adafddd0ce40c4ce9f052d2ee5e8ea38a2fb58
Commit Graph
1730 Commits
Author SHA1 Message Date
Jacob Vosmaer bebe110dff Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-http-controller 
Conflicts:
	lib/gitlab/workhorse.rb
 2016-06-08 10:31:33 +02:00
Robert Speicher 4531b5da64 Merge branch 'upgrade-nokogiri' into 'master' 
Bump nokogiri to 1.6.8

Number of important security and bug fixes. See:
https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md#168--2016-06-06

See merge request !4500
 2016-06-07 20:36:54 +00:00
Stan Hu 5bb3e1934c Add LGPLv2 to license whiltelist 2016-06-07 10:14:18 -07:00
Yorick Peterse 99913b3d2c Merge branch '18082-instrument-repositorycheck-singlerepositoryworker-manually' into 'master' 
Instrument `RepositoryCheck::SingleRepositoryWorker` manually

See merge request !4446
 2016-06-07 16:56:01 +00:00
Alejandro Rodríguez d485ec9f1c Instrument RepositoryCheck::SingleRepositoryWorker manually 
This worker is called manually by `RepositoryCheck::BatchWorker` meaning it's not tracked automatically by the Sidekiq middleware.
 2016-06-07 12:10:55 -04:00
Jacob Schatz 5b83abcc01 Merge branch 'issue_14189' into 'master' 
Ability to prioritize labels

Closes #14189 

See merge request !4009
 2016-06-07 15:15:07 +00:00
Connor Shea 7900c035bf Resolve feedback. 2016-06-06 13:39:36 -06:00
Connor Shea 3c32341215 Add Licensing information and guidelines to the Documentation. 2016-06-06 13:39:36 -06:00
Connor Shea 4cff270f20 Fix up all the decisions in the YML file. 2016-06-06 13:39:36 -06:00
Connor Shea ddca2806c7 Add gems and licenses that were previously missing. Approve a number of licenses after a bunch of research today. 2016-06-06 13:39:36 -06:00
Connor Shea 9442482d09 Add some gems' licenses not caught by License Finder. 
Also add License Finder to CI (only runs on master).
 2016-06-06 13:39:36 -06:00
Alfredo Sumaran fa6593b226 Update method and route 2016-06-06 11:59:49 -05:00
Rémy CoutableandAlfredo Sumaran 499bb9f305 Improve Issuable.order_labels_priority 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-06 11:59:49 -05:00
Thijs WoutersandAlfredo Sumaran d8263b2851 Sort by label priority 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-06-06 11:59:49 -05:00
Alfredo Sumaran 0e2f26dd2a Prioritize labels functionality 2016-06-06 11:59:49 -05:00
Douwe Maan 4d4a9b7c8a Merge branch 'notes-are-awardables' into 'master' 
Notes are awardables

## What does this MR do?

Makes sure we can :thunder_cloud_rain: comments/notes.

## What are the relevant issue numbers?
Follows up upon !2901, depends on !3785

Closes #3655 

## Screenshots (if relevant)
TODO



See merge request !4291
 2016-06-06 16:48:35 +00:00
Fatih AcetandZ.J. van de Weg 8dc1fa0d8d Updated MR notes. 2016-06-06 16:02:11 +02:00
Timothy Andrew 128549f10b Implement U2F registration. 
- Move the `TwoFactorAuthsController`'s `new` action to `show`, since
  the page is not used to create a single "two factor auth" anymore. We
  can have a single 2FA authenticator app, along with any number of U2F
  devices, in any combination, so the page will be accessed after the
  first "two factor auth" is created.
- Add the `u2f` javascript library, which provides an API to the
  browser's U2F implementation.
- Add tests for the JS components
 2016-06-06 12:50:31 +05:30
Z.J. van de Weg 9d491712cf Merge branch 'master' into awardables 2016-06-03 15:20:11 +02:00
Jacob Vosmaer fea591e5c5 Rename finder to find_in_gitlab_or_ldap 2016-06-02 13:42:18 +02:00
Jacob Vosmaer 8299fc277d Merge branch 'master' into git-http-controller 
Conflicts:
	config/routes.rb
 2016-06-02 13:31:11 +02: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 7d33fba7af Merge branch 'upgrade-devise-two-factor' into 'master' 
Upgrade devise, devise-two-factor, and attr_encrypted

Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support.

attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future.

See merge request !4216
 2016-06-02 00:44:41 +00:00
Z.J. van de Weg 91a7b9333b Incorportate feedback 2016-06-01 12:10:08 +02:00
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
Connor Shea d47b2b92c9 Upgrade devise and devise-two-factor, remove devise-async 
Devise (3.5.4 => 4.1.1) Changelog:
https://github.com/plataformatec/devise/blob/master/CHANGELOG.md

devise-two-factor (2.0.1 => 3.0.0) Changelog:
https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md

These are reliant on each other, so they have to be upgraded together.

devise-async is no longer necessary as Devise 4.1 fixes a bug with the
ActiveJob integration.
 2016-05-30 13:51:21 -06: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
ZJ van de Weg cbd7801b3d Merge branch 'master' into awardables 2016-05-30 18:54:08 +02: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
ZJ van de Weg 7ae536002a Merge branch 'master' into awardables 2016-05-25 14:41:25 +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