home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,804 Commits 48 Branches 340 Tags
7cf86dc472702f58cf39ccdb0c22d97dbaba999d
Commit Graph
12804 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 7cf86dc472 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into ee-7-4 2014-10-03 18:13:24 +03:00
Dmitriy Zaporozhets 74ac2df364 Merge branch 'fix_for_project_without_group' into 'master' 
Fix for project without group

See merge request !192
 2014-10-03 15:11:50 +00:00
Marin Jankovski 94ba1f0108 If project doesn't have a group, group ldap sync is false. 2014-10-03 16:43:19 +02:00
Marin Jankovski d3bf5f63f4 Updated packages for 7.2.0 and 7.2.1 for ubuntu and debian. 2014-10-03 15:43:33 +02:00
Dmitriy Zaporozhets eafac5932f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/merge_requests_helper.rb
	doc/update/README.md
	lib/gitlab/reference_extractor.rb
 2014-10-03 16:18:40 +03:00
Dmitriy Zaporozhets 778923b66c Merge branch 'ee-7-4' into 'master' 
Recent 7.4 code from CE into EE

Fixes #187

See merge request !190
 2014-10-03 12:29:35 +00:00
Dmitriy Zaporozhets da38e4f5db Merge branch 'do_not_show_ldap_users_in_dropdowns' into 'master' 
Do not show ldap users in dropdowns

Fixes #160

See merge request !186
 2014-10-03 11:40:35 +00:00
Dmitriy Zaporozhets 43217dd5dd Merge branch 'cirosantilli-factor-commit-msg-textarea' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/edit_tree/show.html.haml
 2014-10-03 14:38:33 +03:00
Dmitriy Zaporozhets 8188427e83 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-03 14:12:40 +03:00
Dmitriy Zaporozhets 5709e8d76c Merge branch 'new-milestone-link' into 'master' 
New milestone and label links

Fixes #1364

Fixes #1586

See merge request !1145
 2014-10-03 11:11:58 +00:00
Dmitriy Zaporozhets 5a541f5445 Merge branch 'signin_after_confirmation' into 'master' 
Signin after confirmation

Fixes #1471

See merge request !1146
 2014-10-03 11:11:12 +00:00
Dmitriy Zaporozhets 9afa80bbae Fix EE code after membership refactoring 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-03 14:09:07 +03:00
Robert Schilling 91e346eb33 Merge pull request #7948 from cirosantilli/rm-outdated-comment 
Remove outdated comment on the project test seed
 2014-10-03 12:57:09 +02:00
Robert Schilling 77979280e0 Merge pull request #7947 from cirosantilli/rm-assign-without-effect 
Remove assignment without effect.
 2014-10-03 12:52:04 +02:00
Dmitriy Zaporozhets 0676f1da7e Merge pull request #7934 from Soullivaneuh/font-awesome 
Upgrade to Font Awesome v4.2
 2014-10-03 13:42:24 +03:00
Dmitriy Zaporozhets ac6f032122 Merge pull request #7779 from Bugagazavr/hook_tag_push_events 
Add tag push events to project hook api
 2014-10-03 13:38:56 +03:00
Dmitriy Zaporozhets 03b44916ba Merge pull request #7754 from Bugagazavr/hooks 
More information in merge request hook
 2014-10-03 13:37:19 +03:00
Dmitriy Zaporozhets 4ebe718d69 Merge branch 'factor-commit-msg-textarea' of https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/projects/blob/_remove.html.haml
 2014-10-03 13:34:25 +03:00
Dmitriy Zaporozhets 1c077cac8a Merge pull request #7941 from Razer6/update/org-mode 
Bump org-mode to 0.9.9
 2014-10-03 13:32:17 +03:00
Ciro Santilli 6014e28c2d Remove outdated comment on the project test seed 2014-10-03 12:21:23 +02:00
Ciro Santilli 3960a5a25a Remove assignment without effect. 2014-10-03 12:19:31 +02:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Sytse Sijbrandij 0cc30145f4 Merge pull request #7664 from bbodenmiller/patch-2 
add HSTS Policy warning
 2014-10-03 12:12:23 +02:00
Marin Jankovski f74dba8c42 Merge pull request #7595 from bbodenmiller/patch-4 
add sign-in count
 2014-10-03 10:23:26 +02:00
Marin Jankovski 910d5cf332 Merge pull request #7748 from yglukhov/clickable-source-repo-in-mr 
Source repo is now clickable.
 2014-10-03 10:21:59 +02:00
Marin Jankovski d97a9d4935 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-10-03 10:10:07 +02:00
Robert Schilling 9f45e22993 Merge pull request #7858 from cirosantilli/def-param-paren 
Add parenthesis to function def with arguments.
 2014-10-03 10:07:15 +02:00
Ciro Santilli 2e9f5de868 Add parenthesis to function def with arguments. 2014-10-03 09:18:46 +02:00
Kirill Zaitsev b4963e9dda Add tag_push_events to project hook api 2014-10-03 10:23:32 +04:00
Robert Schilling a3d90c5045 Merge pull request #7946 from Razer6/changelog_entry 
Add move to html-pipeline-gitlab to changelog
 2014-10-03 08:02:57 +02:00
Robert Schilling d5c8ca7412 Add move to html-pipeline-gitlab to changelog 2014-10-03 08:01:54 +02:00
Robert Schilling 6f797f86de Merge pull request #7834 from cirosantilli/rm-empty-eq 
Remove test line without effect because no should.
 2014-10-03 07:48:22 +02:00
Robert Schilling 06fd4bf7e1 Merge pull request #7922 from cirosantilli/improve-remove-file-commit-placeholder 
Improve remove file oommit message textarea placeholder.
 2014-10-03 00:00:33 +02:00
Robert Schilling b0a3276253 Bump org-mode to 0.9.9 2014-10-02 18:53:07 +02:00
Sytse Sijbrandij a835b0ce17 Merge branch 'be_pragmatic_about_shelling_out' into 'master' 
Be pragmatic about shelling out

See merge request !1149
 2014-10-02 16:32:59 +00:00
Jacob Vosmaer 97c5d38097 Add a counterexample to 'do it in Ruby' 2014-10-02 18:27:18 +02:00
Dmitriy Zaporozhets 4e96c84e58 Merge branch 'show-build-coverage-in-mr' into 'master' 
Show build coverage in MR

![Screenshot 2014-10-02 18.20.53](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/a8ff7b23bd/Screenshot_2014-10-02_18.20.53.png)

See merge request !1148
 2014-10-02 16:25:19 +00:00
Dmitriy Zaporozhets 1a09a805ea Merge branch 'fix-500-admin-user-page' into 'master' 
Fix 500 admin user page

See merge request !1147
 2014-10-02 16:24:23 +00:00
Dmitriy Zaporozhets 8e33f9460c Show test coverage results in MR if available 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 18:17:47 +03:00
Dmitriy Zaporozhets 71fce0b2f8 Comment random failing test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 17:49:11 +03:00
Dmitriy Zaporozhets 616e05ef75 Fix a lot of stuff related to membership refactoring 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 17:31:36 +03:00
Dmitriy Zaporozhets 929678899d Fix 500 error on admin user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 17:15:09 +03:00
Dmitriy Zaporozhets c41805f60e Add test for broken admin user page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-02 17:14:42 +03:00
Marin Jankovski b82d4018b8 Merge branch 'Razer6-feature/zen_for_gfm' 2014-10-02 15:43:47 +02:00
Marin Jankovski cc2d7771db Merge branch 'feature/zen_for_gfm' of github.com:Razer6/gitlabhq into Razer6-feature/zen_for_gfm 
Conflicts:
	CHANGELOG
 2014-10-02 15:41:05 +02:00
Marin Jankovski 30c447ed2f Try signing in the user after user confirmation is correct and redirect to dashboard, otherwise redirect to signin page 2014-10-02 14:38:26 +02:00
Jacob Vosmaer 798977c87b Merge branch 'missing_update_links' into 'master' 
Missing omnibus update links in help/update

I took the liberty and refactored it a little. Open issue https://gitlab.com/gitlab-org/omnibus-gitlab/issues/269

Here is a screen

![gitlab_update_page](https://gitlab.com/uploads/axil/gitlab-ce/0395154f23/gitlab_update_page.png)

See merge request !202
 2014-10-02 12:24:23 +00:00
Sytse Sijbrandij 429924e616 Merge branch 'remove_git_hook_offer' into 'master' 
Remove git hook offer

Fixes #184

See merge request !189
 2014-10-02 12:15:51 +00:00
Sytse Sijbrandij 9e78949e48 Merge branch 'gitlab_flow_edit' into 'master' 
Gitlab flow edit

Changed GitHub Flow links

See merge request !201
 2014-10-02 11:59:22 +00:00
Achilleas Pipinellis 1489b8d50e Update the help/update docs to include omnibus as well. 2014-10-02 13:39:26 +03:00