home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 19:46:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,295 Commits 48 Branches 340 Tags
c8e9eac25f384ece01de756a808fffddfc578546
Commit Graph
14295 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schilling c8e9eac25f Merge pull request #8852 from niosus/patch-1 
typo fixed
 2015-02-24 11:15:46 +01:00
Igor Bogoslavskyi 51b18fe6f6 typo fixed 
fixed a typo in an url to gitlab-ssl. Now it does not return the 404 error
 2015-02-24 10:50:18 +01:00
Dmitriy Zaporozhets 5e2098feb4 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-23 23:50:18 -08:00
Dmitriy Zaporozhets 93447c4b14 Merge pull request #8760 from yglukhov/diff-sticky-headers 
Diff headers made sticky
 2015-02-23 23:50:07 -08:00
Dmitriy Zaporozhets 8461c4b4d3 Merge pull request #8180 from Bugagazavr/mr_update 
Trigger merge request hook when source updated
 2015-02-23 23:48:46 -08:00
Dmitriy Zaporozhets 9f9a79abe0 Merge pull request #8782 from jvanbaarsen/no-test-class-caching 
Don't cache classes in tests
 2015-02-23 23:47:23 -08:00
Dmitriy Zaporozhets 4932accb3f Merge pull request #8783 from jvanbaarsen/spring-update 
Updated spring
 2015-02-23 23:46:53 -08:00
Dmitriy Zaporozhets 2f8e6311e2 Merge pull request #8798 from jirutka/update-charlock_holmes 
Update charlock_holmes to 0.7.3
 2015-02-23 23:46:33 -08:00
Dmitriy Zaporozhets 8b9348e80d Merge branch 'improve-sidebar' into 'master' 
Improve sidebar menu for project settings

See merge request !1582
 2015-02-24 07:46:03 +00:00
Dmitriy Zaporozhets 894f73783c Merge branch 'bump-gitlab-shell-2-5-4' into 'master' 
Bump gitlab-shell to 2.5.4

For #2042

See merge request !1584
 2015-02-24 07:19:13 +00:00
Marin Jankovski 2feaa69cd5 Update version of gitlab-shell in the installation and update documentation. 2015-02-23 23:10:35 -08:00
Dmitriy Zaporozhets bd6550a512 Bump gitlab-shell to 2.5.4 2015-02-23 22:54:32 -08:00
Marin Jankovski ac918a5cdb Merge branch 'ldap-need-no-password' into 'master' 
LDAP users don't need to set a password to Git over HTTP.

Fixes https://github.com/gitlabhq/gitlabhq/issues/8846.

See merge request !1575
 2015-02-24 06:52:29 +00:00
Dmitriy Zaporozhets 17296b932b Merge branch 'fix_url_links_for_gitlab_issue_tracker' into 'master' 
Using gitlab url to build links for gitlab issue tracker and add a spec.

Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/1107

This needs to go to master as the paths changed since rails upgrade

Fix for stable branch is in https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1574/

See merge request !1573
 2015-02-24 05:50:32 +00:00
Marin Jankovski 24c8381de2 Merge branch 'improve-services-migration' into 'master' 
Make services migration more reliable

Fix for #2045 . I did not use SQL because its hard to convert SQL fields into json with interpolation and without errors. SO I just improved current migration with next:

* skip validation to prevent exception because of new `template` field in validation
* check column for existance before adding them.
  It should allow people who already failed this migration to re-run ti
* select objects with 500 batch size for better memory usage

Tested on migration from 7.0 to 7.9.0.pre

See merge request !1581
 2015-02-24 05:30:25 +00:00
Dmitriy Zaporozhets 14117c23af Merge branch 'fix-avatar-access' into 'master' 
Allow non authenticated access to avatars

For #2047

cc @douwe

See merge request !1583
 2015-02-24 05:29:38 +00:00
Dmitriy Zaporozhets 64ca07c3b9 Better readme title 2015-02-23 21:27:41 -08:00
Douwe MaanandMarin Jankovski c9829146f8 LDAP users don't need to set a password to Git over HTTP. 2015-02-23 20:04:18 -08:00
Dmitriy Zaporozhets 897a2de54c Allow non authenticated access to avatars 2015-02-23 19:35:42 -08:00
Dmitriy Zaporozhets 12589d3390 Improve sidebar menu for project settings 2015-02-23 18:43:39 -08:00
Marin Jankovski b0dfe434c6 Using gitlab url to build links for gitlab issue tracker and add a spec. Fix rubocop warnings in path. 2015-02-23 18:43:26 -08:00
Dmitriy Zaporozhets a4118ca445 Merge branch 'warn-against-stable-branch-changelog' into 'master' 
Ensure that people don't view the changelog on the stable branch because we don't update that one.

See merge request !1568
 2015-02-24 02:18:08 +00:00
Dmitriy Zaporozhets c87c1cb3b9 Merge branch 'api-empty-commit' into 'master' 
Improve error messages when file editing fails

Give more specific errors in API responses and web UI flash messages when a file update fails.  See #1479.

Instead of returning false from `Gitlab::Satellite::Files::EditFileAction#commit!` when a `Grit::Git::CommandFailed` error is raised, now `#commit!` raises a different error depending on whether the failure happened during checkout, commit, or push.

@dzaporozhets Please let me know if you want to change the HTTP status codes or the error messages in `Files::UpdateService`

cc @sytse

See merge request !1569
 2015-02-24 02:17:23 +00:00
Dmitriy Zaporozhets 8601c502e8 Merge branch 'fix-commit-zen-mode' into 'master' 
Fix ZenMode on commit show and milestone edit pages.

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

See merge request !1557
 2015-02-24 02:02:44 +00:00
Dmitriy Zaporozhets 0f6221e736 Make services migration more reliable 2015-02-23 17:56:05 -08:00
Dmitriy Zaporozhets b821a1bd41 Fix markdown image uploader after rails update 2015-02-23 16:29:32 -08:00
Dmitriy Zaporozhets c6860a5828 Fix style issue for rubocop 2015-02-23 15:18:45 -08:00
Marin Jankovski d5437c4838 Merge branch 'git_clone_holder_btn' into 'master' 
Git Clone btn more apparent

Added a faint background to the button to show that it is in an
active state for the user. White background is often hard to tell
if something is being pushed, so adding a "shadow" makes it a bit
easier to tell.

Fixes #1998

See merge request !1577
 2015-02-23 22:33:19 +00:00
Sabba Petri 0e1d31a734 Git Clone btn more apparent 
Added a faint background to the button to show that it is in an
active state for the user. White background is often hard to tell
if something is being pushed, so adding a "shadow" makes it a bit
easier to tell. Fixes #1998
 2015-02-23 13:52:02 -08:00
Dmitriy Zaporozhets bb2358379e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-23 10:05:49 -08:00
Dmitriy Zaporozhets d723bf78b8 Fix git-over-http 2015-02-23 10:05:18 -08:00
Robert Schilling 859c4175f3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-23 18:41:18 +01:00
Robert Schilling 6de3000b5b Merge pull request #8841 from patschi/patch-1 
Update 7.7-to-7.8.md
 2015-02-23 18:39:00 +01:00
Robert Schilling 348b8737e4 Merge branch 'master' into 'master' 
Bump GitLab for Docker to version 7.8.0

See merge request !347
 2015-02-23 14:31:48 +00:00
Robert Schilling c8dad4f611 Merge branch 'spelling-correction' into 'master' 
Small spelling correction

There's a small spelling error on the project settings page. 'an project' is not correct English.

See merge request !348
 2015-02-23 14:30:52 +00:00
Marco Wessel 48eeb006f0 Correct spelling of 'a project avatar' 2015-02-23 15:10:56 +01:00
shafan e23110e6f1 Bump GitLab for Docker to version 7.8.0 2015-02-23 14:08:46 +00:00
Dmitriy Zaporozhets 9459e9db24 Fix updating issue 500 error 2015-02-22 22:26:09 -08:00
Dmitriy Zaporozhets 19327e6535 Fix dashboard for projects > 30 2015-02-22 22:06:43 -08:00
Vinnie Okada 5f232b5687 Improve error messages when file editing fails 
Give more specific errors in API responses and web UI flash messages
when a file update fails.
 2015-02-22 16:01:49 -07:00
Sytse Sijbrandij 31774a3bb7 Ensure that people don't view the changelog on the stable branch because we don't update that one. 2015-02-22 12:49:00 -08:00
Patrik Kernstock 2bf0a690bf Update 7.7-to-7.8.md 2015-02-22 21:39:13 +01:00
Sytse Sijbrandij ebe0d34128 Remove unreleased for 7.8 in changelog. 2015-02-22 10:52:30 -08:00
Dmitriy Zaporozhets a7f52b6cc2 Merge branch 'rails-4.1.9' into 'master' 
Upgrade to Rails 4.1.9

Upgrade the Rails gem to 4.1.9.  Rails behavior changed in version 4.1.2, requiring that we avoid using slashes in arguments to path helpers.  This MR changes routing to use nested resources for that reason.

TODO:

* [x] Make Spinach tests green
* [x] Make it mergeable

cc @sytse @dzaporozhets

See merge request !1494
 2015-02-22 18:50:28 +00:00
Dmitriy Zaporozhets 3afd91f28d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-22 10:48:38 -08:00
Vinnie Okada 5a8d8b6f20 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/projects.html.haml
 2015-02-22 07:55:30 -07:00
Robert Schilling 352115497f Merge pull request #8840 from Razer6/fix_7-8-update_guide 
Update gitlab-shell to 2.5.3 in 7-8 update guide, fixes #8838
 2015-02-22 11:53:16 +01:00
Robert Schilling 50305c363b Update gitlab-shell to 2.5.3 in 7-8 update guide, fixes #8838 2015-02-22 10:54:28 +01:00
Dmitriy Zaporozhets 44dbbb76fc Merge branch 'ui-improvements' into 'master' 
UI improvements

* filter tabs for dashboard projects page
* handle all sidebars on mobile with Aside javascript class
* remove semantic ui dependency
* fix broken sidebar for dsahboard

See merge request !1567
 2015-02-22 06:39:26 +00:00
Dmitriy Zaporozhets 87b04868a1 Create Aside js class for handling all sidebars in UI for mobile devices 2015-02-21 22:01:27 -08:00