home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 16:46:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,461 Commits 48 Branches 340 Tags
7-7-stable
Commit Graph
13461 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Schilling 98ef392529 Update gitlab-shell to 2.4.2 for 7.7 install/update guide 
closes #8718, closes #8721
 2015-02-03 12:21:15 +01:00
Dmitriy Zaporozhets bd982900a6 Version 7.7.2 v7.7.2 2015-01-29 17:30:12 -08:00
Dmitriy Zaporozhets 5b9fe347d7 Bump gitlab-shell version 2015-01-29 16:12:07 -08:00
Dmitriy Zaporozhets 89bdcc6017 Improvements to LDAP::User model 
* method #changed? also tracks changes of identites (fixes issue with email mapping)
* find ldap identity before initialize one
 2015-01-29 16:11:24 -08:00
Dmitriy Zaporozhets f773935866 Be more careful with parsing changes from gitlab-shell 2015-01-29 16:11:10 -08:00
Dmitriy Zaporozhets 7e2b71e069 Merge pull request #8658 from volker-fr/7-7-stable 
installation documentation: fixed to be installed versions
 2015-01-26 16:36:34 -08:00
Volker d8565744c8 installation documentation: install gitlab-shell 2.4.1 (as it is found in the update documentation) 2015-01-26 11:17:47 -05:00
Volker feb141b54c installation documentation: updated to use latest stable 7.7 branch 2015-01-26 11:11:14 -05:00
Dmitriy Zaporozhets 41ab9e1fa8 Version 7.7.1 v7.7.1 2015-01-22 20:02:20 -08:00
Dmitriy Zaporozhets 12fa3e1b94 Faster autocomplete for users/issues/emojiis 
Instead of loading all issues and merge requests we load only open one.
This will reduce time load for autocomplete resources significantly
 2015-01-22 19:02:06 -08:00
Valery SizovandDmitriy Zaporozhets 98423148c5 allow to use http in redirect url 2015-01-22 19:01:05 -08:00
Dmitriy Zaporozhets 4e7de9492f Show modal window with instructions if GH OAuth is not enables 2015-01-22 19:00:31 -08:00
Dmitriy Zaporozhets c04f11dab5 Version 7.7.0 v7.7.0 2015-01-21 08:57:58 -08:00
Jeroen van Baarsen 9d414c3199 Merge pull request #8605 from Razer6/fix_gitlab_shell_doc_stable 
Update gitlab-shell in docs to 2.4.1 (stable)
 2015-01-18 14:59:39 +01:00
Robert Schilling e2e23b853a Update gitlab-shell in docs to 2.4.1 2015-01-18 13:12:29 +01:00
Dmitriy Zaporozhets 31901f36ab Version 7.7.0.rc4 v7.7.0.rc4 2015-01-17 23:38:16 -08:00
Dmitriy Zaporozhets e1fb2d4a13 Expand sidebar only for large devices 2015-01-17 23:24:03 -08:00
Dmitriy Zaporozhets ece32141fb Merge branch '7-7-rc4' into '7-7-stable' 
Changes for 7.7.0.rc4

See merge request !1409
 2015-01-18 07:05:06 +00:00
Dmitriy Zaporozhets e4a4358254 Small improvements to CI 2015-01-17 22:23:26 -08:00
Valery SizovandDmitriy Zaporozhets 20d10b6391 Application admin scaffold 2015-01-17 22:23:26 -08:00
Dmitriy Zaporozhets ea4b0d75dd Fix commits pagination 
Conflicts:
	CHANGELOG
 2015-01-17 22:21:57 -08:00
Dmitriy Zaporozhets 17cbd3dca0 Version 7.7.0.rc3 v7.7.0.rc3 2015-01-16 20:21:23 -08:00
Dmitriy Zaporozhets a47b93bb88 Merge branch '7-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-7-stable 2015-01-16 19:40:20 -08:00
Dmitriy Zaporozhets d6f8e05bde Fix passign args to original authenticate_user! 2015-01-16 19:39:33 -08:00
Dmitriy Zaporozhets 4c305d4dd6 Validate application settings only if column exists 2015-01-16 19:39:23 -08:00
Dmitriy Zaporozhets b9d09a0c5e Add tests to home page url redirect 2015-01-16 19:39:13 -08:00
Dmitriy Zaporozhets 4a49a937cd Allow to specify home page for non logged-in users 2015-01-16 19:39:02 -08:00
Dmitriy Zaporozhets 4fcc3d6b6b Fix broadcast message overflow 2015-01-16 19:23:07 -08:00
Dmitriy Zaporozhets 589930bdce Fix signup settings 2015-01-16 19:22:46 -08:00
Dmitriy Zaporozhets b2620e2e00 Version 7.7.0.rc2 v7.7.0.rc2 2015-01-15 14:25:08 -08:00
Dmitriy Zaporozhets 69852abdba Merge branch 'master' into '7-7-stable' 
Changes from master into 7.7

There are list of changes it will be good to have in 7.7 release like comment improvements and fixes to CI on tags

See merge request !1402
 2015-01-15 22:16:50 +00:00
Dmitriy Zaporozhets 23255bff99 Merge branch 'send_checkout_sha_to_services' into 'master' 
Send checkout sha to services

In case of tags it may be useful to have sha of commit this tag points to.
So now web hooks and services get additional parameter `checkout_sha`

See merge request !1400
 2015-01-15 20:01:31 +00:00
Dmitriy Zaporozhets 089df35f02 Merge branch 'remove-password-strength-indicator' into 'master' 
Remove password strength indicator

We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.

See merge request !1399
 2015-01-15 19:20:43 +00:00
Dmitriy Zaporozhets 5254de907d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-15 11:18:26 -08:00
Dmitriy Zaporozhets 4cd1b6d98e Merge branch 'fix-tab-index' into 'master' 
Fix tab index

Fixes #1892

See merge request !1401
 2015-01-15 19:18:04 +00:00
Dmitriy Zaporozhets de27375d6c Test git builder over annotated tag 2015-01-15 11:17:47 -08:00
Dmitriy Zaporozhets c6ab8d04e8 Fix tabindex for comment form 2015-01-15 10:34:40 -08:00
Sytse Sijbrandij e310199a53 Merge pull request #8576 from kfei/docker/update-omnibus-package 
Update the Omnibus package in Dockerfile
 2015-01-15 10:26:41 -08:00
Dmitriy Zaporozhets a0d4235c04 Send checkout sha for web hooks and services 2015-01-15 10:26:33 -08:00
Jacob Vosmaer b79ada97bb Remove password strength indicator 
We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.
 2015-01-15 14:10:13 +01:00
Dmitriy Zaporozhets 1e0f36b42a Merge branch 'fix-comments' into 'master' 
Fix comments

Fixes:

* drag-n-drop works for diff comments
* selecting images works for diff comments
* preview works for edit comments
* drag-n-drop works for edit comments
* selecting images works for edit comments
* if comment presented on 'Discussion' and 'Changes' tabs - after edit it updates on both tabs.
* Correctly hide form when edit comment on diff
* fix full-screen for diff comments

See merge request !1398
 2015-01-15 09:18:10 +00:00
Dmitriy Zaporozhets b124d9e0bb Comment broken test because I dont have time to improve it 2015-01-15 01:17:07 -08:00
Dmitriy Zaporozhets 10f45cf33a Fix specs 2015-01-15 00:37:33 -08:00
Dmitriy Zaporozhets cad685e70b Refactor zen mode. Make it works in diffs 2015-01-15 00:15:12 -08:00
Dmitriy Zaporozhets 3333bd4608 Explicitly enable drag-n-drop for issue/mr/wiki markdown forms 2015-01-14 23:18:21 -08:00
Dmitriy Zaporozhets 23498337b1 Clone comment form on edit. Fixes bug with disappearing textarea or cancel of edit 2015-01-14 23:09:30 -08:00
Dmitriy Zaporozhets 28dc04aac2 Merge branch 'view-link-first' into 'master' 
View link first

See merge request !1397
 2015-01-15 06:43:51 +00:00
Dmitriy Zaporozhets 47f0a8dbdd Merge branch 'fix-scroll-issue' into 'master' 
Fix scroll issue

Fixes #1886

See merge request !1396
 2015-01-15 06:43:25 +00:00
Dmitriy Zaporozhets 4babc50eb7 Huge set of fixes for comments logic 2015-01-14 22:42:58 -08:00
Dmitriy Zaporozhets 80e784edb8 Fix image drag-n-drop to diff comments 2015-01-14 21:43:31 -08:00