home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 11:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,328 Commits 48 Branches 340 Tags
82483f953671237896e8131d557642161ed5e97f
Commit Graph
14328 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski 82483f9536 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-24 16:54:26 -08:00
Marin Jankovski 4aeb916566 Update changelog for 7.8.1 2015-02-24 16:53:59 -08:00
Dmitriy Zaporozhets 2cd2543c44 Merge branch 'mwessel/gitlab-ce-set-last-activity-at' into 'master' 
Give last_activity_at a default value so it will always be set

For https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/345

See merge request !1589
 2015-02-24 23:15:04 +00:00
Dmitriy Zaporozhets b7dd0decf8 Merge branch 'fix-404-admin-delete' into 'master' 
Fix 404 when deleting a project from the admin section

This is some additional fallout from the rails upgrade. Need to use plural namespaces in the path function to get project deletion to go back to the project listing.

See merge request !351
 2015-02-24 21:18:20 +00:00
Dmitriy Zaporozhets 53784fb637 Merge branch 'master' into 'master' 
Updated Gitorious import icons

See merge request !353
 2015-02-24 21:17:11 +00:00
Dmitriy Zaporozhets 2cedeb4856 Merge branch 'contributed-projects' into 'master' 
Improve contributed project and commit calendar selection.

Fixes #2024.

See merge request !1554
 2015-02-24 21:07:05 +00:00
Dmitriy Zaporozhets d73a058941 Merge branch 'update_grack' into 'master' 
Update gitlab-grack to 2.0.0.rc2

See merge request !1585
 2015-02-24 20:58:19 +00:00
Dmitriy Zaporozhets 037a981017 Merge branch 'sidebar_state_toggle' into 'master' 
Toggle sidebar button more obvious

The toggle is now at the top of the sidebar because it is not noticeable
near the bottom. By placing it at the top, users will immediately know that
they can have more space if they desire versus on the bottom, they will have
to search for it and that's not desired.

Fixes #2044

See merge request !1579
 2015-02-24 20:49:31 +00:00
Dmitriy Zaporozhets ecb12f2111 Merge branch 'master' into update_grack 
Conflicts:
	Gemfile.lock
 2015-02-24 11:51:08 -08:00
Dmitriy Zaporozhets 75048fcd69 Revert "Update charlock_holmes to 0.7.3" 
This reverts commit c217860ae7.
 2015-02-24 11:46:42 -08:00
Dmitriy Zaporozhets 7bcf1c0044 Merge branch 'gitlab_linguist_update' into 'master' 
Update gitlab-linguist

Closes #1859

See merge request !1588
 2015-02-24 19:39:51 +00:00
Dmitriy Zaporozhets 46516411ef Merge branch 'web_editor_branch' into 'master' 
Web Editor: save to new branch

Implements #1931

See merge request !1523
 2015-02-24 19:38:45 +00:00
Valery Sizov 545f12d548 update gitlab-linguist 2015-02-24 20:46:52 +02:00
Valery Sizov 53e404144c changelog && documentation 2015-02-24 20:36:11 +02:00
Sabba Petri 5b6d6bbc19 Added square caret to Back to Settings button 
This was done to show difference between Open/Close toggle, which
was using the same arrow as Back to Settings button previously.
 2015-02-24 09:42:35 -08:00
Sabba Petri 7f200b7d18 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into sidebar_state_toggle 2015-02-24 09:41:10 -08:00
Dmitriy Zaporozhets 428df28cda Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-24 09:13:29 -08:00
Douwe Maan 5179c5830b Contributed projects either have user pushes or created MRs. 2015-02-24 18:13:11 +01:00
Dmitriy Zaporozhets 59877d313e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-02-24 09:09:31 -08:00
Dmitriy Zaporozhets f7c948223d Fix access to attachments uploaded with 'Choose file' button for public 
access
 2015-02-24 09:08:34 -08:00
Douwe Maan 1bf9fa8c7f Exclude forks from profile contributions list. 2015-02-24 16:28:23 +01:00
Robert Schilling b4fd2602be Merge pull request #8854 from Bugagazavr/patch-3 
Update Changelog
 2015-02-24 13:55:46 +01:00
Bugagazavr 1e1a95f5c3 Update Changelog 2015-02-24 15:12:25 +03:00
Valery Sizov 63c4f3ca76 update gitlab-grack to 2.0.0.rc2 2015-02-24 13:20:04 +02:00
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
Valery Sizov 3177693c6f WebEditor: save to new branch: spinach 2015-02-24 11:43:20 +02:00
Valery Sizov 71a844cdae Web Editor: save to new branch 2015-02-24 11:43:20 +02:00
Marcin Kulik f6add983d3 Use proper Gitorious icons on import pages 2015-02-24 09:42:07 +00:00
Marin Jankovski 7561b1c2a4 Merge branch 'profile_tooltip_addition' into 'master' 
Added Profile tooltip

For consistency sake, the profile in the navbar has a tooltip.

Fixes #2007

See merge request !1572
 2015-02-24 08:06:22 +00: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