home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 07:06:17 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,431 Commits 48 Branches 340 Tags
e151bbbb285c8eafe4fe8aff06d225fef71e520e
Commit Graph
6057 Commits
Author SHA1 Message Date
Jan-Willem van der Meer 0e276f9cbf Move allowed call to LDAP::User 2014-10-03 17:27:14 +02:00
Jan-Willem van der Meer d9355ea590 Allow proper provider_name for ldap provider 2014-10-03 14:00:28 +02:00
Jan-Willem van der Meer 97aa12fcc8 Dynamically initiate LDAP strategies 2014-10-02 12:45:53 +02:00
Jan-Willem van der Meer 3a358005e4 Merge branch 'feature-refactor-oauth-instance-methods' into feature-multi-ldap-servers 2014-10-01 17:33:50 +02:00
Jan-Willem van der Meer ad1c2f79d9 Refactor Gitlab::LDAP::User to instance methods 2014-10-01 14:11:50 +02:00
Marin Jankovski 383825145f Add ability to remove the branded page logo. 2014-09-26 14:52:11 +02:00
Marin Jankovski 4ddabdd793 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-09-22 14:38:02 +02:00
Marin Jankovski f0231e409a Revert "Diff headers made sticky." 
This reverts commit 6eb85b1a30.
 2014-09-22 13:48:28 +02:00
Robert Schilling 28ba985ef9 Save last scrollposition and scroll back when leaving ZEN mode 2014-09-21 21:06:38 +02:00
Dmitriy Zaporozhets 9971a9692a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-20 19:22:42 +03:00
Robert Schilling d5badd7ef6 Prevent default action when closing zen mode 2014-09-20 18:15:36 +02:00
Robert Schilling 8fd0d74bd8 Merge pull request #7801 from cirosantilli/dry-zen-view 
Factor zen mode.
 2014-09-20 17:09:20 +02:00
Ciro Santilli adaec60a50 Factor zen mode. 2014-09-20 15:32:46 +02:00
Robert Schilling d40311a91d Merge pull request #7788 from bbodenmiller/patch-25 
link to page that discusses how to generate ssh key
 2014-09-19 20:34:34 +02:00
Ciro Santilli 04ef3ddc6c Improve zen mode internals. 2014-09-19 17:32:23 +02:00
Dmitriy Zaporozhets eb764b1b7b Fix star/fork button UI issue if count > 100 2014-09-19 12:33:09 +00:00
Ben Bodenmiller 9a1fe30682 link to page that discusses how to generate ssh key 2014-09-19 02:17:22 -07:00
Marin Jankovski 2ad6789216 Merge remote-tracking branch 'CE/master' into merge_ce_7_3_to_ee 2014-09-16 12:55:21 +02:00
Dmitriy Zaporozhets c24f9cb651 Merge branch 'merge-79190fe06b-7.3.0-pre' into 'master' 
Merge 79190fe06b (7.3.0-pre) and serialize_service_properties

This combines two merges because each individual merge breaks the build on its own.

See merge request !175
 2014-09-16 09:43:58 +00:00
Jacob Vosmaer be34a0c939 Merge remote-tracking branch 'subscribers/serialize_service_properties' into merge-79190fe06b-7.3.0-pre 2014-09-15 15:22:44 +02:00
Jacob Vosmaer f13bcb2b45 Fix LdapGroupLink error message 
ActiveModel::Validations has an 'errors' attribute, but no 'error'.
 2014-09-15 14:26:26 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Dmitriy Zaporozhets 09b23228df Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-15 10:20:43 +03:00
Dmitriy Zaporozhets 79190fe06b Merge branch 'implement_comments_on_parallel_diff' into 'master' 
Implement comments on parallel diff

Fixes #1565

See merge request !1090
 2014-09-15 07:19:50 +00:00
Tamer Sherif a391cd21d7 Fix grammatical error in 'not merged changes' msg 2014-09-14 12:31:32 +03:00
Marin Jankovski 9945e8c424 Move organizing of comments to helper. 2014-09-12 19:51:44 +02:00
Marin Jankovski e84861d510 Remove unecesarry array operations. 2014-09-12 19:41:32 +02:00
Marin Jankovski 5564fe3149 Add comments on the side-by-side diff. 2014-09-12 18:44:53 +02:00
Wes Gurney 81a70bf515 Adding ability to configure webhook timeout via gitlab.yml 2014-09-12 11:38:14 -04:00
Dmitriy Zaporozhets cbb44b9da3 Merge pull request #7662 from Razer6/disable_buttons_on_empty_form 
[UX] Disable buttons if form is empty
 2014-09-12 13:41:48 +03:00
Dmitriy Zaporozhets 318d5d93e3 Merge pull request #7522 from Razer6/fix_tags_count 
[UX] Update tag count if tag gets deleted via web interface
 2014-09-12 13:39:56 +03:00
Sytse Sijbrandij 21134df202 Merge pull request #7713 from bbodenmiller/patch-5 
Add Feedback link
 2014-09-12 11:32:41 +02:00
Ben Bodenmiller 47171aab3d add requests link 
Add requests link for feature requests.
 2014-09-12 02:07:17 -07:00
Dmitriy Zaporozhets a034a46652 Merge pull request #7737 from Razer6/feature/zenmaster 
Zen Mode for issues/MR/notes
 2014-09-12 08:54:52 +03:00
Robert Schilling 37a274a568 update tags count if tag gets deleted 2014-09-12 07:35:57 +02:00
Drew Blessing 09cdd94322 Fix serialize migration. Fixes #7734 2014-09-11 18:41:03 -05:00
Robert Schilling 233d89a9e7 Disable buttons if required forms are empty 2014-09-11 19:48:02 +02:00
Robert Schilling 0d5958c729 Close Zen mode by ESC, foward/backward 2014-09-11 19:24:51 +02:00
Robert Schilling 58c0a4f5cf Implement zen mode for issues/MRs/notes 
Close Zen mode by ESC, foward/backward
 2014-09-11 19:24:51 +02:00
Jan-Willem van der Meer e45861d7d9 Display multiple LDAP servers on login page 2014-09-11 16:14:54 +02:00
Dmitriy Zaporozhets 80174c16d6 Merge branch 'feature-oauth-refactoring' into 'master' 
Feature oauth refactoring

Only use class methods when needed. In addition, make a proper extension of Gitlab::Oauth::User.

See merge request !1062
 2014-09-11 13:33:06 +00:00
Dmitriy Zaporozhets 350f557479 Make labels clickable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-11 14:18:00 +03:00
Drew Blessing 0b3d4b62a3 Complete serialization of service properties for EE 2014-09-11 05:44:00 -05:00
Jan-Willem van der Meer f3346a472e Patch oauth refactoring into EE 2014-09-11 11:53:52 +02:00
Jan-Willem van der Meer bf0de1a500 Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring 2014-09-11 11:46:08 +02:00
Dmitriy Zaporozhets 17fd28468e Merge branch 'project-destroy-redirect' into 'master' 
Redirect users to Projects Admin Page after removing a project

Fixes issue #543 by redirecting the user to "admin_projects_path" and displaying the flash alert "Project removed."

See merge request !178
 2014-09-11 06:45:52 +00:00
Dmitriy Zaporozhets 59187157b1 Merge pull request #7730 from bbodenmiller/patch-12 
url -> URL
 2014-09-11 09:24:11 +03:00
Ben Bodenmiller d915a239f7 Increase import timeout from 2 to 4 minutes 
This file was missed in https://github.com/gitlabhq/gitlabhq/commit/4535db04b28996baf118bafeb77acd16065e5c5a.
 2014-09-10 18:38:47 -07:00
Ben Bodenmiller 9d9109eecf url -> URL 2014-09-10 18:20:06 -07:00
Ben Bodenmiller bc04c26325 url -> URL 2014-09-10 18:19:31 -07:00