home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,709 Commits 48 Branches 340 Tags
2bccce2ebf46b7b09e68dd2ab4ae8b51b99bbc55
Commit Graph
10709 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeroen van Baarsen 2bccce2ebf Merge branch 'doc/fix_update_doc_links' into 'master' 
Fix links in Update guide 5.1 to 6.0

Links have missing slashes and additionally point to `master` branch.
This MR prevents a 404 error (missing slash) and points to the correct branch (6-0-stable) for comparison of the config files.

/cc @sytse
 2014-07-17 10:07:05 +00:00
Jeroen van Baarsen 9054430583 Merge branch 'fix-typo' into 'master' 
Fix typos in CONTRIBUTING.md

This MR fixes two typos in [CONTRIBUTING.md](CONTRIBUTING.md).
 2014-07-17 10:05:41 +00:00
Sytse Sijbrandij c300788830 Ensure the readme answers the most important questions. 2014-07-16 20:56:58 +02:00
Dmitriy Zaporozhets de582ab375 Fix user params when edit from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-16 15:12:33 +03:00
Dmitriy Zaporozhets aa25c0ffe5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-07-16 11:58:53 +03:00
Dmitriy Zaporozhets 2f78e6d00e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-07-16 11:58:33 +03:00
Dmitriy Zaporozhets cc5a5a03a4 Fix typo in CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-16 11:55:34 +03:00
Sytse Sijbrandij 150aadad33 Merge pull request #7314 from axilleas/houndci_single_quotes 
Make houndci prefer single quotes.
 2014-07-16 10:55:30 +02:00
Dmitriy Zaporozhets 13f5e36076 Merge branch 'release-template' into 'master' 
Release template

See merge request !972
 2014-07-16 07:39:39 +00:00
Achilleas Pipinellis e9a9238165 Make houndci prefer single quotes. 2014-07-16 09:38:42 +03:00
Sytse Sijbrandij c3a7d3e147 Link to issues with # 2014-07-16 08:38:19 +02:00
Dmitriy Zaporozhets e3df8bf015 Merge branch 'release-template' into 'master' 
Release template

Consider moving stuff like the packages from the 22nd to the 21st

See merge request !971
 2014-07-16 06:35:52 +00:00
Dmitriy Zaporozhets 4f00d8fd1c More stuff to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-16 09:30:14 +03:00
Dmitriy Zaporozhets 9879c427ce If MR commits are empty if does not mean compare failed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 23:04:14 +03:00
Sytse Sijbrandij e043da1376 Split work to the 17th and make issue template. 2014-07-15 21:53:20 +02:00
Dmitriy Zaporozhets a6546f51e2 Default gix max size to 20mb 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 20:59:47 +03:00
Dmitriy Zaporozhets 2d6c4d2bb0 Merge branch 'fix-huge-mr' into 'master' 
Fix huge merge requests

* Refactored suppress logic for diffs
* Increase grit memory limit (should mix most of 502 errors when create MR)
* show first 100 files for huge diffs

Fixes #1424

See merge request !970
 2014-07-15 17:28:03 +00:00
Dmitriy Zaporozhets 1d5965267b Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 19:42:51 +03:00
Dmitriy Zaporozhets be5b6db883 Refactor diff suppress logic and diff views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 18:28:21 +03:00
Dmitriy Zaporozhets d1001e3d98 Merge branch 'show_milestone_status_on_show_page' into 'master' 
Show milestone status on group milestone show page

Closes #1430

See merge request !969
 2014-07-15 14:34:29 +00:00
Dmitriy Zaporozhets 3dc347a369 Cleanup diff stats UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 16:05:56 +03:00
Dmitriy Zaporozhets 45623089e2 Refactor MR build process 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 15:34:06 +03:00
Dmitriy Zaporozhets 3780444ccb Increase grit memory limit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-15 15:27:54 +03:00
Marin Jankovski b916bf4368 Fix test for no milestone description. 2014-07-15 12:27:29 +02:00
Marin Jankovski dcc6302c85 Show milestone state on group milestone show page. 2014-07-15 11:59:37 +02:00
Marin Jankovski 275a5281d5 Milestone is closed only if all milestones are closed. 2014-07-14 15:25:09 +02:00
Dmitriy Zaporozhets d9bc57d18e Merge branch 'branches_with_no_parent' into 'master' 
Branches with no parent cannot be merged

Solves `undefined method 'reduce' for false:FalseClass`

Fixes #1415

See merge request !967
 2014-07-14 11:51:58 +00:00
Dmitriy Zaporozhets bbef0ae03b Merge branch 'satellite_chdir' into 'master' 
Remove thread-unsafe Dir.chdir from Satellite#lock

See merge request !968
 2014-07-14 11:51:26 +00:00
Dmitriy Zaporozhets 2099aa38b6 Merge pull request #7131 from skv-headless/per_request_rules_caching 
per request project rules caching
 2014-07-14 13:58:53 +03:00
Dmitriy Zaporozhets c50f895196 Merge pull request #7196 from cirosantilli/patch-2 
Enforce md style.
 2014-07-14 13:49:15 +03:00
Jacob Vosmaer 99e1f4888a Remove thread-unsafe Dir.chdir from Satellite#lock 
This is made possible by changes in gitlab-grit 2.6.10.
 2014-07-14 12:16:57 +02:00
Marin Jankovski 7435b879a6 Error message needs to be correct. 2014-07-14 12:11:01 +02:00
Marin Jankovski 207bc8a0e7 Branches without parent commit cannot be merged. 2014-07-14 11:06:14 +02:00
Dmitriy Zaporozhets 25c9bf4b6a Restore blue color for sign-in button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-14 10:02:46 +03:00
Dmitriy Zaporozhets 8ecbfe3dc9 Merge pull request #7285 from jvanbaarsen/fixed-wrong-permission 
A Developer cannot manage milestones
 2014-07-14 09:29:36 +03:00
Dmitriy Zaporozhets d8ac75a28f Merge branch 'improve-login-page' into 'master' 
Improve login page

* use max-width for brand logo to prevent stretch of small images
* improve default brand logo to be centred on any kind of screen
* hide logo for small screens
* hide text for xs screens
* reduce amount of text on sign-in page

Fixes #1423

See merge request !966
 2014-07-13 19:46:13 +00:00
Dmitriy Zaporozhets 62d2aed036 Improve login page behaviour 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-13 20:56:29 +03:00
Christoph Uschkrat fa5726690f Fix typos in CONTRIBUTING.md 2014-07-13 15:22:11 +02:00
Dmitriy Zaporozhets 8da8efb387 Merge branch 'redirect_on_signin' into 'master' 
Redirect on signin

Fixes #1346

See merge request !965
 2014-07-11 19:27:04 +00:00
Marin Jankovski 3b80d68f9d Add in the tests. 2014-07-11 19:53:10 +02:00
Marin Jankovski 07b9d80604 Use devise stored_location to redirect after signing for both public and private pages. 2014-07-11 19:53:10 +02:00
Marin Jankovski 55efb2d9f2 Revert "Merge branch 'redirect_after_login' into 'master'" 
This reverts commit 5aaa35656e, reversing
changes made to 5b8c176767.
 2014-07-11 19:53:10 +02:00
Dmitriy Zaporozhets f3b0cb77fc Make brand image fill 100% width of space 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 17:42:03 +03:00
Dmitriy Zaporozhets 248b12833c Add bottom links for sign-in page so I can get to Public area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 17:37:20 +03:00
Dmitriy Zaporozhets 8c15fd0014 Rename brand helper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 17:16:44 +03:00
Dmitriy Zaporozhets 849985a62d Merge branch 'ee-login-layout' into 'master' 
EE login layout

Port login layout from EE

See merge request !964
 2014-07-11 13:48:50 +00:00
Dmitriy Zaporozhets 5c51e4835e Small fixes for sign-in page text 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 16:42:09 +03:00
Dmitriy Zaporozhets ba5787c38a Less distracting git clone line for public page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 16:39:04 +03:00
Dmitriy Zaporozhets 6d332ce146 Improve signin/signup/reset pages UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 16:05:57 +03:00
Dmitriy Zaporozhets f4fbc7b92b Add box shadow to login box 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-11 15:14:48 +03:00