home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,254 Commits 48 Branches 340 Tags
d76700a87f1c643d2603d008b2c67deddfeeafa3
Commit Graph
11254 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets d76700a87f 7.1 CE to EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 18:20:54 +03:00
Dmitriy Zaporozhets a2e5ec7c40 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into release-candidate 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	doc/install/installation.md
 2014-07-17 18:17:32 +03:00
Dmitriy Zaporozhets b634d2801e Merge branch 'release-candidate' into 'master' 
Release candidate

* add 7.0-7.1 update doc
* add 6.0-7.1 update doc
* update installation doc
* Bump version

Part of #1435

See merge request !977
v7.1.0.rc1 		2014-07-17 15:13:49 +00:00
Dmitriy Zaporozhets 2bd20b7c4d Update guide from 6.0 to 7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:57:04 +03:00
Dmitriy Zaporozhets 4db9c6e0a8 Version to rc1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:50:04 +03:00
Dmitriy Zaporozhets f59a721ee0 Point installation manual to 7-1-stable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:49:54 +03:00
Dmitriy Zaporozhets 771f4dbc3e Update guide from 7.0 to 7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-17 16:49:33 +03:00
Dmitriy Zaporozhets f10c189b21 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-07-17 15:56:18 +03:00
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
Jeroen van Baarsen d5d6fc3d41 Merge pull request #7257 from cirosantilli/patch-4 
Clariy squash comes after review.
 2014-07-16 22:05:41 +02:00
Sytse Sijbrandij c300788830 Ensure the readme answers the most important questions. 2014-07-16 20:56:58 +02:00
Dmitriy Zaporozhets 28cab28426 Merge branch 'ce-7-1' into 'master' 
Merge CE 7.1 into EE

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1438

See merge request !128
 2014-07-16 12:56:08 +00: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 253ae9feda Fix user params when edit from admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-16 15:09:15 +03:00
Dmitriy Zaporozhets cc193d7068 Fix 404 for invited projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-16 14:25:56 +03:00
Dmitriy Zaporozhets 4e9f7c21b5 Fix admin edit user password 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-16 14:22:24 +03:00
Dmitriy Zaporozhets b03b69e23e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/images/brand_logo.png
	app/assets/stylesheets/sections/login.scss
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/appearances_helper.rb
	app/views/layouts/devise.html.haml
 2014-07-16 12:39:45 +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
Dmitriy Zaporozhets cd5b863f6f Merge branch 'images_in_help_pages' into 'master' 
Images in help pages

Fixes #121

See merge request !127
 2014-07-15 10:32:09 +00: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 c68e3f77ad Render images in help pages. 2014-07-15 11:28:46 +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
Jacob Vosmaer e4cd0c93ed Add Jenkins fix to the EE CHANGELOG 2014-07-14 11:44:34 +02:00
Dmitriy Zaporozhets 5ace25cf20 Merge branch 'ee_fix_jenkins_status_check' into 'master' 
EE - fix jenkins status check

When using Jenkins CI via the `JenkinsService` class, GitLab queries Jenkins for build status of a specific git commit shasum. This check however is done in an error prone way and fails for Jenkins jobs with multiple modules. Please note the three bubbles at the bottom of this screenshot: http://i.imgur.com/cptQdOG.png

This MR changes the checking code to make use of a HTML parser and selects the element of interest via its xpath. It was manually tested against Jenkins version 1.554 (LTS release as of today) with both maven and freestyle type jobs.
 2014-07-14 09:35:15 +00:00