summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update gitlab-shell to 2.4.2 for 7.7 install/update guide7-7-stableRobert Schilling2015-02-032-2/+2
| | | | closes #8718, closes #8721
* Version 7.7.2v7.7.2Dmitriy Zaporozhets2015-01-291-1/+1
|
* Bump gitlab-shell versionDmitriy Zaporozhets2015-01-291-1/+1
|
* Improvements to LDAP::User modelDmitriy Zaporozhets2015-01-292-2/+23
| | | | | * method #changed? also tracks changes of identites (fixes issue with email mapping) * find ldap identity before initialize one
* Be more careful with parsing changes from gitlab-shellDmitriy Zaporozhets2015-01-291-1/+1
|
* Merge pull request #8658 from volker-fr/7-7-stableDmitriy Zaporozhets2015-01-261-3/+3
|\ | | | | installation documentation: fixed to be installed versions
| * installation documentation: install gitlab-shell 2.4.1 (as it is found in ↵Volker2015-01-261-1/+1
| | | | | | | | the update documentation)
| * installation documentation: updated to use latest stable 7.7 branchVolker2015-01-261-2/+2
|/
* Version 7.7.1v7.7.1Dmitriy Zaporozhets2015-01-221-1/+1
|
* Faster autocomplete for users/issues/emojiisDmitriy Zaporozhets2015-01-222-3/+27
| | | | | Instead of loading all issues and merge requests we load only open one. This will reduce time load for autocomplete resources significantly
* allow to use http in redirect urlValery Sizov2015-01-221-0/+6
|
* Show modal window with instructions if GH OAuth is not enablesDmitriy Zaporozhets2015-01-222-4/+31
|
* Version 7.7.0v7.7.0Dmitriy Zaporozhets2015-01-211-1/+1
|
* Merge pull request #8605 from Razer6/fix_gitlab_shell_doc_stableJeroen van Baarsen2015-01-182-2/+2
|\ | | | | Update gitlab-shell in docs to 2.4.1 (stable)
| * Update gitlab-shell in docs to 2.4.1Robert Schilling2015-01-182-2/+2
|/
* Version 7.7.0.rc4v7.7.0.rc4Dmitriy Zaporozhets2015-01-171-1/+1
|
* Expand sidebar only for large devicesDmitriy Zaporozhets2015-01-171-2/+2
|
* Merge branch '7-7-rc4' into '7-7-stable'Dmitriy Zaporozhets2015-01-1813-6/+150
|\ | | | | | | | | | | Changes for 7.7.0.rc4 See merge request !1409
| * Small improvements to CIDmitriy Zaporozhets2015-01-173-6/+12
| |
| * Application admin scaffoldValery Sizov2015-01-1711-5/+139
| |
| * Fix commits paginationDmitriy Zaporozhets2015-01-172-0/+4
|/ | | | | Conflicts: CHANGELOG
* Version 7.7.0.rc3v7.7.0.rc3Dmitriy Zaporozhets2015-01-161-1/+1
|
* Merge branch '7-7-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-7-stableDmitriy Zaporozhets2015-01-161-1/+1
|\
| * Version 7.7.0.rc2v7.7.0.rc2Dmitriy Zaporozhets2015-01-151-1/+1
| |
* | Fix passign args to original authenticate_user!Dmitriy Zaporozhets2015-01-161-2/+2
| |
* | Validate application settings only if column existsDmitriy Zaporozhets2015-01-162-2/+7
| |
* | Add tests to home page url redirectDmitriy Zaporozhets2015-01-163-4/+7
| |
* | Allow to specify home page for non logged-in usersDmitriy Zaporozhets2015-01-168-9/+28
| |
* | Fix broadcast message overflowDmitriy Zaporozhets2015-01-161-12/+8
| |
* | Fix signup settingsDmitriy Zaporozhets2015-01-161-1/+1
|/
* Merge branch 'master' into '7-7-stable'Dmitriy Zaporozhets2015-01-1541-1436/+710
|\ | | | | | | | | | | | | | | 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
| * Merge branch 'send_checkout_sha_to_services' into 'master'Dmitriy Zaporozhets2015-01-153-54/+76
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Test git builder over annotated tagDmitriy Zaporozhets2015-01-152-4/+8
| | |
| | * Send checkout sha for web hooks and servicesDmitriy Zaporozhets2015-01-152-52/+70
| | |
| * | Merge branch 'remove-password-strength-indicator' into 'master'Dmitriy Zaporozhets2015-01-1512-772/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Remove password strength indicatorJacob Vosmaer2015-01-1512-772/+12
| | |/ | | | | | | | | | | | | | | | | | | | | | 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.
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-01-151-1/+1
| |\ \
| | * \ Merge pull request #8576 from kfei/docker/update-omnibus-packageSytse Sijbrandij2015-01-151-1/+1
| | |\ \ | | | |/ | | |/| Update the Omnibus package in Dockerfile
| | | * Update the Omnibus package in Dockerfilekfei2015-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | From 7.5.3 to 7.6.2. Signed-off-by: kfei <kfei@kfei.net>
| * | | Merge branch 'fix-tab-index' into 'master'Dmitriy Zaporozhets2015-01-151-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Fix tab index Fixes #1892 See merge request !1401
| | * | Fix tabindex for comment formDmitriy Zaporozhets2015-01-151-1/+1
| |/ /
| * | Merge branch 'fix-comments' into 'master'Dmitriy Zaporozhets2015-01-1517-593/+598
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Comment broken test because I dont have time to improve itDmitriy Zaporozhets2015-01-151-7/+8
| | | |
| | * | Fix specsDmitriy Zaporozhets2015-01-151-10/+5
| | | |
| | * | Refactor zen mode. Make it works in diffsDmitriy Zaporozhets2015-01-158-141/+125
| | | |
| | * | Explicitly enable drag-n-drop for issue/mr/wiki markdown formsDmitriy Zaporozhets2015-01-141-0/+3
| | | |
| | * | Clone comment form on edit. Fixes bug with disappearing textarea or cancel ↵Dmitriy Zaporozhets2015-01-142-4/+7
| | | | | | | | | | | | | | | | of edit
| | * | Huge set of fixes for comments logicDmitriy Zaporozhets2015-01-149-194/+210
| | | |
| | * | Fix image drag-n-drop to diff commentsDmitriy Zaporozhets2015-01-143-241/+244
| | | |
| * | | Merge branch 'view-link-first' into 'master'Dmitriy Zaporozhets2015-01-152-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | View link first See merge request !1397