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
24,579 Commits 48 Branches 340 Tags
4eec96eb7ae64208999938685247aa426a24c815
Commit Graph
24579 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan 4eec96eb7a Merge branch 'issue_13623' into 'master' 
Show days remaining instead of elapsed time for Milestone.

Closes #13623

See merge request !2978
 2016-03-02 10:54:30 +00:00
Douwe Maan ca8a44be82 Merge branch 'issue_13716' into 'master' 
Check for conflicts before creating new revert branch

Fixes #13716 

See merge request !2953
 2016-03-02 10:51:43 +00:00
Douwe Maan 8eadb373ec Merge branch 'rs-filter-array' into 'master' 
Add FilterArray class to Banzai



See merge request !3053
 2016-03-02 10:46:23 +00:00
Douwe Maan 8ec49e47ec Merge branch 'mail-room-config-without-rails' into 'master' 
Don't load all of GitLab in mail_room

Fixes #12731

cc @jacobvosmaer 

See merge request !3005
 2016-03-02 10:43:57 +00:00
Achilleas Pipinellis c71c5876cb Merge branch 'fix/wrong-anchor-in-process' into 'master' 
Fix wrong anchor in PROCESS.md



See merge request !3060
 2016-03-02 10:23:01 +00:00
Rémy Coutable 62f518539c Merge branch 'fix/12652-omniauth-import-from-gitlab-com-fails' into 'master' 
Fix import from gitlab.com fails

_Originally opened at !2896 by @kazsw._

- - -

Fixes #12652

CGI.escape encodes '/' by default.
Second argument can be removed.

See merge request !2988
 2016-03-02 10:19:20 +00:00
Rémy Coutable f8b13d2cc0 Fix wrong anchor in PROCESS.md 
[ci skip]
 2016-03-02 11:00:32 +01:00
Kazuki SawadaandRémy Coutable fc170baf3f Fix import from gitlab.com 
Fixes #12652
 2016-03-02 10:35:44 +01:00
Rémy Coutable 1217b5b489 Merge branch 'shortcuts-help' into 'master' 
Fix help keyboard shortcut for relative URL setups

Fixes gitlab-org/gitlab-ce#12751

See merge request !3016
 2016-03-02 09:13:19 +00:00
Dmitriy Zaporozhets 5b0cada764 Merge branch 'rs-update-sprockets' into 'master' 
Bump sprockets to `~> 3.3.5`

Closes #6069

See merge request !3055
 2016-03-02 08:56:25 +00:00
Achilleas Pipinellis 07bc0b43b0 Merge branch 'notes_guidelines' into 'master' 
Change doc styleguide to use blockquotes for notes



See merge request !3009
 2016-03-02 08:00:33 +00:00
Achilleas Pipinellis 156642cfa4 Merge branch 'saml-doc-update' into 'master' 
Updated SAML and Omniauth docs

Updated SAML and Omniauth docs with information on the new behavior recently introduced in !2882

/cc @ernstvn @DouweM 

See merge request !2950
 2016-03-02 06:02:04 +00:00
Rubén Dávila 03d58f564c Little refactor for milestone_remaining_days helper from last code review. 2016-03-01 19:40:50 -05:00
Rubén Dávila 7773180219 Show days remaining instead of elapsed time for Milestone. 2016-03-01 19:40:50 -05:00
Rubén Dávila d9e0191592 Add some specs for Repository#revert. 2016-03-01 19:16:27 -05:00
Rubén Dávila 0c116d8ed6 Check for conflicts before creating target branch. 2016-03-01 19:16:27 -05:00
Robert Speicher 940d689d18 Bump sprockets to ~> 3.3.5 
Closes #6069
 2016-03-01 18:25:10 -05:00
Robert Speicher c9b1132217 Add FilterArray class to Banzai 2016-03-01 15:54:35 -05:00
Robert Speicher 6aa50165b0 Merge branch 'logged-out-search' into 'master' 
Logged out search

Fixes #13676  

See merge request !3045
 2016-03-01 19:57:10 +00:00
Artem Sidorenko 8be19db9d4 Fix help keyboard shortcut for relative URL setups 2016-03-01 20:30:14 +01:00
Achilleas Pipinellis b8f8a55b8d Merge branch 'document-design-to-development-process' into 'master' 
Add a paragraph on "Implementing design & UI elements" in CONTRIBUTING.md

Closes gitlab-com/www-gitlab-com#544

See merge request !2983
 2016-03-01 19:22:37 +00:00
Patricio Cano 3f70c8f2db Style updates. 2016-03-01 13:51:47 -05:00
Dmitriy Zaporozhets 4c8721b25a Refactor UI header for logged out users 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-01 19:31:52 +01:00
Rémy Coutable a6f26598bc Add a paragraph on "Implementing design & UI elements" in CONTRIBUTING.md 
Also, link to this new paragraph in PROCESS.md and improved a bit this
document.

[ci skip]
 2016-03-01 18:56:23 +01:00
Douwe Maan 90ced487f2 Merge branch 'add_customer_label' into 'master' 
Add customer label explanation and change label references to markdown

Add customer label plus change valid labels to markdown format so they render.

The unchanged labels do not have actual/valid labels behind them. We should consider removing them since they're obviously not used.

cc/ @sytses @dzaporozhets @DouweM What do you think about removing the unused labels?

Label names are now rendered

![Screen_Shot_2016-02-25_at_10.59.03_AM](/uploads/4869416c120422b605df8982a46f6d61/Screen_Shot_2016-02-25_at_10.59.03_AM.png)

See merge request !2972
 2016-03-01 16:55:34 +00:00
Douwe Maan 9b3c1a8c4f Merge branch 'fix/commit-status-api-improvement' into 'master' 
Return empty array when commit has no statuses in API

This makes API endpoint for Commit Statuses return empty array instead
of 404 when commit exists, but has no statuses.

Closes #3080

See merge request !3010
 2016-03-01 16:50:23 +00:00
Douwe Maan 6b0e37b05f Merge branch 'rel-url-fix' into 'master' 
Fix relative URL

See https://github.com/gitlabhq/gitlabhq/issues/10053

 1. Same configuration way for relative URL like with Omnibus
 2. Loading the relative configuration from Rakefile as Rails do not load initializers for `asset:precompile`

First point has another positive side effect: no collisions (due to git controlled `application.rb`) any more during the upgrades of source based installations and relative url configuration

 - [x] tests on the source based installation
 - [x] tests on the centos&ubuntu omnibus packages

Fixes: gitlab-org/gitlab-ce#13730, gitlab-org/gitlab-ce#13727, gitlab-org/omnibus-gitlab#1143 and https://github.com/gitlabhq/gitlabhq/issues/10053

See merge request !2979
 2016-03-01 16:24:43 +00:00
Dmitriy Zaporozhets d4e327a592 Merge branch 'login-flash' into 'master' 
Add bottom margin for flash container on login page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @jschatz1 @skyruler 

Fixes #13935 

See merge request !3040
 2016-03-01 16:10:44 +00:00
Dmitriy Zaporozhets 352ea5d6d0 Merge branch 'sidebar-overlap-fix' into 'master' 
Fix issue with overlap of sidebar links.

Thanks @iamphill for the help with this one. 

![Screen_Shot_2016-03-01_at_10.19.52_AM](/uploads/f203fde79ae397ad18f23c4108f1c306/Screen_Shot_2016-03-01_at_10.19.52_AM.png)

cc @iamphill @alfredo1 @dzaporozhets @rymai 

See merge request !3043
 2016-03-01 16:10:22 +00:00
Douwe Maan 3d1de5ba35 Merge branch 'rs-wiki-toc' into 'master' 
Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilter

Closes #2494

See merge request !2952
 2016-03-01 16:06:40 +00:00
Douwe Maan ad9137a785 Merge branch 'rs-avatar-validation' into 'master' 
Only validate avatar cropping values when avatar is present AND changed

Closes #13905

See merge request !3018
 2016-03-01 16:03:38 +00:00
Douwe Maan acd9881061 Merge branch 'rs-fix-user-namespace_uniq' into 'master' 
Properly check for a pre-existing error in `User#namespace_uniq`

Rails adds an empty error to the Errors object even if you just call
`#[]` on it:

```
[1] pry(main)> u = User.last
[2] pry(main)> u.errors.keys
=> []
[3] pry(main)> u.errors[:username].present?
=> false
[4] pry(main)> u.errors.keys
=> [:username]
```

See merge request !3017
 2016-03-01 16:02:57 +00:00
Douwe Maan 204a989533 Merge branch 'rs-improve-grace-period' into 'master' 
Don't show any "2FA required" message if it's not actually required

Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.

See merge request !3014
 2016-03-01 16:01:18 +00:00
Kamil Trzciński 8cba0612e1 Merge branch 'fix-failing-tests' into 'master' 
Precompile assets before all spinach tests

Try to fix failing tests.

cc @jschatz1 

See merge request !3041
 2016-03-01 15:36:38 +00:00
Dmitriy Zaporozhets b4c842b321 Add CHANGELOG and test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-01 16:29:16 +01:00
Drew BlessingandDrew Blessing b7e26e9c47 Add customer label explanation and change label references to markdown [ci skip] 2016-03-01 09:28:04 -06:00
Jacob Schatz 1bdc274f64 Fix issue with overlap of sidebar links. 2016-03-01 10:18:05 -05:00
Dmitriy Zaporozhets c9a8f2a03e Enable search for logged-out users 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-01 15:57:28 +01:00
Kamil Trzcinski 182533608c Precompile assets before all spinach tests 2016-03-01 15:54:25 +01:00
Dmitriy Zaporozhets b43d022c66 Add bottom margin for flash container on login page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-01 15:36:19 +01:00
Jacob Schatz b2f0b3f145 Merge branch 'mr-prefix-activity-view' into 'master' 
Changed # to ! on merge requests on activity view

Closes #9082

![Screen_Shot_2016-02-23_at_11.59.55](/uploads/87b859ae63282ae24025168404beb158/Screen_Shot_2016-02-23_at_11.59.55.png)

See merge request !2938
 2016-03-01 14:02:43 +00:00
Douwe Maan c50a20e790 Merge branch 'comment-batch-size' into 'master' 
Batch size >1000 does not pay off

We did a small experiment to see how a full scan of the Redis keys on
gitlab.com speeds up as we increase the batch size. The values on the
right are time in seconds for a full scan (no delete operations).

```
count: 10);      284.500529021
count: 100);      86.21216934
count: 1_000);    60.931676195
count: 10_000);   60.96355610
count: 100_000);  62.378172541
```

It looks like 1,000 is a good number.

See merge request !2970
 2016-03-01 13:52:49 +00:00
Douwe Maan fac1e0e83c Merge branch 'safe-content-type' into 'master' 
Explain why we mangle blob content types

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

See merge request !2956
 2016-03-01 13:39:26 +00:00
Phil Hughes 43f3439d98 Changed page title 2016-03-01 13:15:09 +00:00
Phil Hughes faac0f261e Fixed issue based on feedback with link text output 2016-03-01 13:04:59 +00:00
Phil Hughes 8e8df6d562 Removed un-used variables 2016-03-01 13:03:39 +00:00
Phil Hughes fbe6b8eeca Replaced prefix with to_reference method calls 2016-03-01 13:03:39 +00:00
Phil Hughes aff5e73f2a Changed # to ! on merge requests on activity view 
Closes #9082
 2016-03-01 13:03:39 +00:00
Grzegorz Bizon 278f4423d1 Improve commit status API specs 2016-03-01 12:33:25 +01:00
Dmitriy Zaporozhets 7d41e4dc9d Merge branch 'rs-update-rails' into 'master' 
Update Rails to 4.2.5.2

See https://groups.google.com/forum/#!msg/rubyonrails-security/ddY6HgqB2z4/we0RasMZIAAJ
and https://groups.google.com/forum/#!msg/rubyonrails-security/ly-IH-fxr_Q/WLoOhcMZIAAJ

See merge request !3019
 2016-03-01 11:25:29 +00:00