home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valery Sizov 705652d625 fix for public snippet 2014-10-24 11:52:52 +03:00
Patricio Cano 7fbc4f5b3a Corrected the layout of the strength indicator to be more consistent throughout the application. 
Fixed a test that was looking for an outdated HTML ID
 2014-10-23 17:49:48 -05:00
Ciro Santilli 9be12dd9ca Merge File basename and direname into split 
Faster because only does one split in that case.
 2014-10-23 23:10:54 +02:00
Jacob Vosmaer 472a6621e9 Fix LDAP config lookup for provider 'ldap' 2014-10-23 22:57:16 +02:00
Steven Sloan 7b339e61e8 update slack-notifier to 1.0.0, use raw webhook_url per slack recommendation 
per changes with slack, they’re now using “static” web hook urls that describe the team & service with IDs that don’t change if the team or service name change. their recommendation is to use the raw webhook_url instead of building it out of components to allow more flexibility

this should also prevent issues cropping up with mistakes in how the urls are parsed
 2014-10-23 14:47:28 -04:00
Hugo Osvaldo Barrera add5d43b6e Close #717 
Add documentation changes to:

 * Set the permissions of the unix socket properly
 * Create the directory for the socket
 * Make sure tmpfiles.d persists said directory

The first change makes sure gitlabl can connect to the socket. The latter two
avoid redis from failing to start on systemd-based systems, including recent
versions of Debian.
 2014-10-23 14:01:44 -03:00
Jacob VosmaerandValery Sizov e8da077d4f Fix LDAP authentication for Git HTTP access 
Conflicts:
	CHANGELOG
 2014-10-23 17:53:19 +03:00
Marin Jankovski 1c1d9f78a4 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-10-23 16:41:39 +02:00
Marin Jankovski 568d60896a Merge branch 'ldap_http_access' into 'master' 
Fix LDAP authentication for Git HTTP access

See merge request !1211
 2014-10-23 14:41:03 +00:00
Ciro Santilli 2c14f9c41f Show nothing instead of unassigned on issues 2014-10-23 16:25:09 +02:00
Sytse Sijbrandij 6e9fb7facc Added relative dates, removed packages for GitLab.com. 2014-10-23 16:24:44 +02:00
Jacob Vosmaer 6b2b20af41 Fix LDAP authentication for Git HTTP access 2014-10-23 14:21:58 +02:00
Sytse Sijbrandij 30eaf4840b Merge branch 'apps-on-website' into 'master' 
Apps on website

See merge request !1210
 2014-10-23 12:12:58 +00:00
Robert Schilling 36649fc250 Merge pull request #8150 from cirosantilli/unecessary-variable-user 
Remove unused variable user at lib/gitlab/markdown
 2014-10-23 13:58:24 +02:00
Ciro Santilli 40815b2baf Remove unused variable user at lib/gitlab/markdown 2014-10-23 13:12:21 +02:00
Jacob Vosmaer 90e960f4ce Merge pull request #8088 from cirosantilli/sh-str-to-args 
Use argument list for sh instead of string
 2014-10-23 12:23:40 +02:00
Robert Schilling 744e11c324 Merge pull request #8053 from mr-vinn/fix-rspec-url 
Fix Rspec error when using non-default port
 2014-10-23 12:11:08 +02:00
Robert Schilling e80ef19b31 Merge pull request #8114 from cirosantilli/rm-global-avatar-js 
Only run avatar chooser Js on pages that need it
 2014-10-23 12:07:45 +02:00
Robert Schilling e6e5e63c29 Merge pull request #8118 from cirosantilli/user-groups-space-link 
Remove whitespace link between user group avatars
 2014-10-23 12:06:01 +02:00
Job van der Voort 6704792933 link third applications to website 2014-10-23 11:11:53 +02:00
Robert Schilling 8fe014e16c Merge pull request #8139 from cirosantilli/doc-import-md-style 
Fix doc raketasts import md style
 2014-10-23 08:50:02 +02:00
Vinnie Okada 41518a467d Remove :keep_repo option 
Always delete repositories from the filesystem when deleting a project.
 2014-10-22 21:08:19 -05:00
Patricio Cano 7039c9868a Updated the IDs of the fields, so that it wouldn't mess with many tests 
Updated some tests to match new IDs
 2014-10-22 20:39:02 -05:00
Ciro Santilli 5d5b3b8273 Fix doc raketasts import md style [ci skip] 2014-10-22 22:56:42 +02:00
Patricio Cano 10528341c2 Merge branch 'master' into feature_password_strength_indicator 2014-10-22 12:44:23 -05:00
Patricio Cano 91c96b3714 Added a password strength indicator 
to the reset password view and the change password view after first login.
Updated JS to work with the updated views.
 2014-10-22 12:40:41 -05:00
Dmitriy Zaporozhets c6efa56ee7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-22 18:12:16 +03:00
Dmitriy Zaporozhets 18ba6987cd Merge branch 'fix_milestone_link' into 'master' 
Fix milestone link in issue page. Closes #174

For a complete description see #174.

See merge request !196
 2014-10-22 14:15:33 +00:00
Dmitriy Zaporozhets ece9036614 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-22 17:04:45 +03:00
Dmitriy Zaporozhets 3220e191ae Merge pull request #7994 from cirosantilli/rm-unneeded-autoload-path 
Remove unneeded app/finders config.autoload path
 2014-10-22 16:56:07 +03:00
Dmitriy Zaporozhets ce01916a68 Merge pull request #8026 from HerrBerg/master 
rake:import:repos: fix exclude wiki regex for importing repositories
 2014-10-22 16:55:25 +03:00
Dmitriy Zaporozhets 80e944ac71 Merge pull request #8054 from bbodenmiller/patch-4 
match latest config from https://cipherli.st/
 2014-10-22 16:52:42 +03:00
Dmitriy Zaporozhets d0296fc915 Merge branch 'master' into 'master' 
fonts: Added "DejaVu Sans Mono" and "Ubuntu Mono"

Everything is better than "Courier New" ...

See merge request !210
 2014-10-22 13:52:09 +00:00
Marin Jankovski ba76dbc366 Version 7.4.0. v7.4.0 2014-10-22 15:42:43 +02:00
Marin JankovskiandMarin Jankovski ed00ab7521 Merge branch 'fix-500-login-disabled' into 'master' 
Fix 500 error on login page if ldap enabled and sign-in disabled

Related to gitlab/gitlabhq#1701

See merge request !1209
 2014-10-22 15:24:40 +02:00
Marin Jankovski 5e2a1c14eb Merge branch 'fix-500-login-disabled' into 'master' 
Fix 500 error on login page if ldap enabled and sign-in disabled

Related to gitlab/gitlabhq#1701

See merge request !1209
 2014-10-22 12:42:41 +00:00
Dmitriy Zaporozhets b0ef23c193 Fix 500 error on login page if ldap enabled and sign-in disabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 13:38:47 +03:00
Dmitriy Zaporozhets ba22e3ae58 Merge branch 'stable-fix-ldap-check' into '7-4-stable' 
Fix ldap check [stable]

Fix ldap check for stable branch

See merge request !1208
 2014-10-22 09:56:59 +00:00
Dmitriy Zaporozhets 4c034142a1 Make gitlab ldap check work for old and new syntax 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 11:12:46 +03:00
Dmitriy Zaporozhets 37e09858e8 Fix rake gitlab:ldap:check 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 11:12:33 +03:00
Dmitriy Zaporozhets 05f19392b7 Make gitlab ldap check work for old and new syntax 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-22 11:11:18 +03:00
Dmitriy Zaporozhets c5ad011917 Merge branch 'fix-ldap-check' into 'master' 
Fix ldap check

Fixes gitlab/gitlabhq#1691

See merge request !1206
 2014-10-22 08:07:08 +00:00
Vinnie Okada 7a5072c5a8 Fix test assertions 
Make sure we're asserting the correct thing when testing visible and
invisible DOM elements.
 2014-10-21 23:29:31 -05:00
Ben Bodenmiller aa923847b2 cleanup monthly release details 2014-10-21 14:23:58 -07:00
Ciro Santilli ab1ad3bd18 Only run namespace select js when needed 
Only needed in admin/projects.
 2014-10-21 22:54:22 +02:00
Ciro Santilli 3418f56a69 Better js -> URL map to reduce unneeded execution 2014-10-21 22:44:02 +02:00
Ben Bodenmiller 3dbe0810f5 cleanup time zone settings 
time zone settings moved to gitlab.yml in https://github.com/gitlabhq/gitlabhq/pull/8015
 2014-10-21 13:36:09 -07:00
Ciro Santilli 93e8a0563d Only run profile js on pages that need it 2014-10-21 21:55:44 +02:00
Ciro Santilli 0e70e3b557 Remove whitespace link between user group avatars 2014-10-21 20:19:07 +02:00
Valery Sizov be80837a69 Update Guide: Change path to nginx config 2014-10-21 19:12:52 +03:00