home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,894 Commits 48 Branches 340 Tags
45349abdb2d2f33660feec9ef66d503fde0b37ce
Commit Graph
14894 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski 45349abdb2 Correct the CentOS 6 package link 2015-02-02 11:21:26 -08:00
Jacob Vosmaer 1015dfbe4d Fix Ubuntu 14.04 download link for 7.7.2-ee 2015-02-02 10:17:40 +01:00
Marin Jankovski 99e0d954d0 Packages for 7.2.2-ee and 5.4.2 CI. 2015-01-29 23:32:47 -08:00
Dmitriy Zaporozhets ac41b3d99c Merge branch 'merge_ce' into 'master' 
Merge CE into EE

See merge request !302
 2015-01-30 01:36:39 +00:00
Marin Jankovski a538dc26a6 Add missing end in group.rb 
Fix redmine issue tracker tests, fix typos. Make sure all fields exist for jira tracker.
 2015-01-29 14:14:43 -08:00
Marin Jankovski 10b372397a Update sidetiq to version 0.6.3. This also downgrades ice_cube to 0.11.1. 2015-01-29 11:52:38 -08:00
Marin Jankovski 3e875b05b4 Merge remote-tracking branch 'ce/master' into merge_ce 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/project_new.js.coffee
	app/controllers/projects_controller.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/project_team.rb
	app/models/user.rb
	app/services/files/create_service.rb
	app/views/layouts/nav/_admin.html.haml
	config/routes.rb
	db/schema.rb
	spec/models/jira_service_spec.rb
	spec/requests/api/projects_spec.rb
 2015-01-29 11:34:43 -08:00
Dmitriy Zaporozhets c9f18d4587 Make sure we dont have exception on date parsing 2015-01-29 01:03:20 -08:00
Dmitriy Zaporozhets a9288e554e Cleanup and make contribution calendar faster 2015-01-29 00:53:43 -08:00
Dmitriy Zaporozhets 6e1f9e746c Merge branch 'gitlab_importer' into 'master' 
Ability to clone project using oauth2 token

See merge request !1447
 2015-01-29 07:03:30 +00:00
Dmitriy Zaporozhets beb7a42548 Merge branch 'ux-fixes' into 'master' 
UX improvements (Implement lessons from user testing)

* add link to permissions help page from new project/group member form
* Improve UX for widget if merge request can not be merged
* Improve wording for fork project page

See merge request !1448
 2015-01-29 07:01:58 +00:00
Dmitriy Zaporozhets de2098f4e7 Merge branch 'haynes/gitlab-ce-commit_calendar' 2015-01-28 23:00:49 -08:00
Dmitriy Zaporozhets c39f80bdb4 Refactor commit calendar a bit. Fixed dates 2015-01-28 23:00:41 -08:00
Dmitriy Zaporozhets 815e9aa283 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into haynes/gitlab-ce-commit_calendar 2015-01-28 22:52:44 -08:00
Dmitriy Zaporozhets 2149f8b52c Merge branch 'css-refactoring' into 'master' 
Small css improvements

See merge request !1450
 2015-01-29 06:43:26 +00:00
Dmitriy Zaporozhets 953c1fff8f Be more careful with parsing changes from gitlab-shell 2015-01-28 17:00:40 -08:00
Dmitriy Zaporozhets ef315dda5f Add light border to bootstrap panels 2015-01-28 16:59:25 -08:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01:00
Valery Sizov d74e732299 update changelog 2015-01-28 15:58:25 -08:00
Valery Sizov 54f6d8c7b5 an ability to clone project with oauth2 token 2015-01-28 15:57:31 -08:00
Dmitriy Zaporozhets f2f7b5a18e Better wording 2015-01-28 15:37:20 -08:00
Dmitriy Zaporozhets b076d8cddb Fix test for merge request 2015-01-28 15:36:12 -08:00
Dmitriy Zaporozhets 1718075a02 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-28 15:15:28 -08:00
Dmitriy Zaporozhets 8e1f032e04 Merge branch 'create_gitlab_internal_issue_service' into 'master' 
Create gitlab internal issue service

Part of #1908

Create a default gitlab issue tracker service which will replace having issue tracker fields for project.

See merge request !1449
 2015-01-28 23:15:13 +00:00
Dmitriy Zaporozhets 76f7553863 Merge pull request #8663 from yglukhov/semantic-ui-sass-update 
Update semantic-ui-sass to 1.8
 2015-01-28 14:49:35 -08:00
Marin Jankovski 68f7302474 Add a scope for visible services, code styling changes for easier readability. 2015-01-28 14:25:55 -08:00
Dmitriy Zaporozhets 34b7472b33 Improve wording for fork project page 2015-01-28 14:20:00 -08:00
Marin Jankovski c6c7552e41 Build the urls inside of the service. 2015-01-28 13:19:32 -08:00
Dmitriy Zaporozhets b40809d731 Improve UX for widget if merge request can not be merged 2015-01-28 11:25:13 -08:00
Dmitriy Zaporozhets 965cec68ac Project/Group access dropdown should contain link to permissions help page 2015-01-28 10:53:28 -08:00
Job van der Voort 5914c7e1b7 Merge branch 'ldap_defaults' into 'master' 
Saner LDAP defaults

I have the impression that most people use LDAP servers listening
on port 389, without encryption. If we make that the default we
give people a smoother ride setting up GitLab.

See merge request !1446
 2015-01-28 18:24:30 +00:00
Marin Jankovski 537cd66d7e Add gitlab internal issue tracker service. 2015-01-28 09:28:17 -08:00
Jacob Vosmaer 087c4cbc3c Make 'plain', port 389 the default for LDAP 2015-01-28 11:34:33 +01:00
Jacob Vosmaer 43da3f0929 Point out common LDAP port/method combinations 2015-01-28 11:34:33 +01:00
Dmitriy Zaporozhets 8eb365c0a0 Separate admin settings from other links 2015-01-27 22:54:46 -08:00
Dmitriy Zaporozhets f79f758581 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-27 22:51:36 -08:00
Dmitriy Zaporozhets 50297f7134 Fix gravatar size for head panel icon 2015-01-27 22:51:11 -08:00
Dmitriy Zaporozhets 6290b75da9 Merge branch '1019' into 'master' 
#1019: Broadcast message does not show up properly with new UI

With the new UI, the broadcast message is the first level child element of the body tag and then render full width without respecting the width of the left sidebar. This makes the message goes under the left sidebar in smaller screen.

This commit fixes the issue by moving the message element into the "page-with-sidebar" div so it will always render together with the main content area with same look as before. The rendering for the search, login and other view without left sidebar remains untouched.

Releases: master, 7-7-stable

Fixes: #1019

See merge request !315
 2015-01-28 01:36:19 +00:00
Visay Keo 35d6d1ce46 Fix broadcast message to show up properly with new UI 
With the new UI, the broadcast message is the first level child element
of the body tag and then render full width without respecting the width
of the left sidebar. This makes the message goes under the left sidebar
in smaller screen.

This commit fixes the issue by moving the message element into the
"page-with-sidebar" div so it will always render together with the main
content area with same look as before. The rendering for the search,
login and other view without left sidebar remains untouched.

Releases: master, 7-7-stable
Fixes: #1019
 2015-01-28 07:24:05 +07:00
Dmitriy Zaporozhets c6f7f09dd2 Merge branch 'fix_git_hook' into 'master' 
Fix pushing to new branch when 'Check whether author is a GitLab user' is enebled.

See merge request !301
 2015-01-27 22:16:22 +00:00
Dmitriy Zaporozhets 8cc111bd03 Fix random failing test 2015-01-27 13:40:23 -08:00
Dmitriy Zaporozhets f57bffc82a Merge branch 'init-from-ui' into 'master' 
Add tests for creating bare repo and first file in UI

Part of #1930

See merge request !1444
 2015-01-27 21:27:59 +00:00
Dmitriy Zaporozhets fc17b440f9 Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master' 
Move external issue tracker away from yml config

See merge request !1442
 2015-01-27 20:57:48 +00:00
Dmitriy Zaporozhets e9514c5074 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-27 12:51:42 -08:00
Dmitriy Zaporozhets 7155507af5 Merge pull request #8609 from jubianchi/issues/6289-api-handle-error-project-repo 
Handle errors on API when a project does not have a repository
 2015-01-27 12:51:18 -08:00
Dmitriy Zaporozhets 0d86a1a3d4 Merge pull request #8638 from hiroponz/remember-project-default-tab-30days 
Remember the project default tab for 30 days
 2015-01-27 12:50:20 -08:00
Dmitriy Zaporozhets 6d034e5f53 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-27 12:49:44 -08:00
Dmitriy Zaporozhets 5e20cb82d7 Merge pull request #8652 from bladealslayer/feature/system_hook_for_groups 
Added support for firing system hooks on group create/destroy and adding...
 2015-01-27 12:49:24 -08:00
Dmitriy Zaporozhets e13868fa69 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-27 12:48:07 -08:00
Dmitriy Zaporozhets b35f1d1c2f Increase font size for issue/mr titles 2015-01-27 12:47:39 -08:00