home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
682 Commits
Author SHA1 Message Date
Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
 2015-02-05 22:01:05 -08:00
Dmitriy Zaporozhets 85c2cb2a19 Merge branch 'submit-comment-on-command-enter' into 'master' 
Submit comment on command enter

Fixes #1869.

See merge request !1474
 2015-02-06 03:46:25 +00:00
Valery Sizov 1ac20698a5 gitlab.com importer: refactorig 2015-02-05 17:03:43 -08:00
Douwe Maan 71668312c4 Submit comment on command-enter. 
Fixes #1869.
 2015-02-05 21:56:25 +01:00
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee 
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
 2015-02-04 18:19:22 -08:00
Dmitriy Zaporozhets cb2093fb61 Merge pull request #8702 from m-a-r-c-o/raw-image-paste-fix 
Fix raw image paste from clipboard
 2015-02-03 17:49:15 -08:00
Dmitriy Zaporozhets 254a63dcf7 Improve collapsing sidebar 2015-02-03 13:11:33 -08:00
Jason Blanchard ee955d7a12 Adds persistent collapse button for left side bar 2015-02-03 11:45:33 -05:00
Marco Cyriacks a54e9e5459 Fix raw image paste from clipboard 
This patch binds the textarea (markdown area) paste event to the
handlePaste() function (that was already present).

Furthermore the event processing is improved in the following way:

- The default paste event handler of the browser is only disabled if the
  browser fully supports clipboardData AND there realy is image data in
  the event object. In all other cases (no support or no image) the
  default handler processes the text paste.
- Some obsolete code was removed.
- The pasteText() function (which is somehow buggy because it places the
  cursor at the end of the text independantly from its position before the
  paste) is only used to place the image link after image data was pasted.
 2015-02-01 22:26:34 +01:00
Dmitriy Zaporozhets 5ec36902dd Fix calendar js 2015-01-29 16:00:46 -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 a9288e554e Cleanup and make contribution calendar faster 2015-01-29 00:53:43 -08:00
Dmitriy Zaporozhets c39f80bdb4 Refactor commit calendar a bit. Fixed dates 2015-01-28 23:00:41 -08:00
Hannes Rosenögger 792ced2f41 Add a commit calendar to the user profile 2015-01-29 01:25:26 +01: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 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
Marin Jankovski 95db00c3e9 Still need the javascript on the project edit page. 2015-01-27 12:19:32 -08:00
Dmitriy Zaporozhets 65e88f1e1a Fixed few tests and improved css style 2015-01-26 22:39:48 -08:00
Marin Jankovski 0da59cb55b Merge branch 'master' into move_external_issue_tracker_away_from_yml_config 
Conflicts:
	app/models/project.rb
	spec/models/project_spec.rb
 2015-01-26 22:12:53 -08:00
Dmitriy Zaporozhets a3d879d427 Refactor web editor 2015-01-26 20:57:42 -08:00
Marin Jankovski 4641514cbf Update rspec tests to the new external issue logic. 2015-01-26 15:59:40 -08:00
Hannes Rosenögger 70c44a0da2 Fix tests, merge conflicts, some minor issues and make the project avatar feature mergable 2015-01-24 18:51:16 +01:00
Steven ThonusandHannes Rosenögger 42bac7f9f2 adding avatar to project settings page added avatar removal show project avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix 2015-01-24 18:51:16 +01:00
Hiroyuki Sato 22b7d2156c Remember the project default tab for 30days 2015-01-23 20:36:53 +09:00
Dmitriy Zaporozhets 7f1633e294 Merge pull request #7615 from yglukhov/new-branch-submit-button-validation 
Validation of 'Create branch' and 'Create tag' buttons
 2015-01-21 23:05:02 -08:00
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Dmitriy Zaporozhets 892be53fa3 Merge pull request #8425 from rumpelsepp/rouge 
Replace highlight.js with rouge-fork rugments
 2015-01-15 14:28:24 -08:00
Jacob Vosmaer b79ada97bb Remove password strength indicator 
We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.
 2015-01-15 14:10:13 +01:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments 
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
 2015-01-15 13:41:11 +01:00
Dmitriy Zaporozhets cad685e70b Refactor zen mode. Make it works in diffs 2015-01-15 00:15:12 -08:00
Dmitriy Zaporozhets 3333bd4608 Explicitly enable drag-n-drop for issue/mr/wiki markdown forms 2015-01-14 23:18:21 -08:00
Dmitriy Zaporozhets 23498337b1 Clone comment form on edit. Fixes bug with disappearing textarea or cancel of edit 2015-01-14 23:09:30 -08:00
Dmitriy Zaporozhets 4babc50eb7 Huge set of fixes for comments logic 2015-01-14 22:42:58 -08:00
Dmitriy Zaporozhets 80e784edb8 Fix image drag-n-drop to diff comments 2015-01-14 21:43:31 -08:00
Dmitriy Zaporozhets 8bc65f6d4b Fix anchors being hidden under fixed navbar issue 2015-01-14 19:39:10 -08:00
Dmitriy Zaporozhets adffb04965 Merge branch 'ce-master' into 'master' 
CE master

See merge request !294
 2015-01-15 01:26:04 +00:00
Dmitriy Zaporozhets ff7f4a134e Revert "Scroll the readme anchors below the navbar." 
This reverts commit b1792d9e4c.
 2015-01-14 09:57:38 -08:00
Dmitriy Zaporozhets 55947addc3 Revert "When anchor is clicked set the correct condition." 
This reverts commit 5140bd8824.
 2015-01-14 09:56:33 -08:00
Valery Sizov badfdf6634 Merge remote-tracking branch 'ee/master' into ce-non-conflict 
Conflicts:
	app/controllers/projects/merge_requests_controller.rb
	app/helpers/projects_helper.rb
	db/schema.rb
 2015-01-13 18:22:38 -08:00
Marin Jankovski 5140bd8824 When anchor is clicked set the correct condition. 2015-01-13 13:14:32 +01:00
Marin Jankovski b1792d9e4c Scroll the readme anchors below the navbar. 2015-01-13 13:01:50 +01:00
Dmitriy Zaporozhets fc63690d84 Merge branch 'admin_email_groups_and_projects_select' into 'master' 
Admin email groups and projects select box

Fixes #219

See merge request !288
 2015-01-12 17:02:14 +00:00
Dmitriy Zaporozhets 9c03c1c545 Make automerge via satellite 2015-01-09 19:10:01 -08:00
Marin Jankovski 84d74e83e8 Add an option for sending emails to all users. 2015-01-09 14:27:02 +01:00
Marin Jankovski 95649362ad Create the admin email select box which queries through both projects and groups. 2015-01-09 13:13:10 +01:00
Marin Jankovski 1297d5bf12 Add projects search query for api and js api. 2015-01-09 13:09:49 +01:00
Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce 
Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb
 2015-01-08 20:37:35 -08:00
Dmitriy Zaporozhets 1abfc0730e Fix performance issue for "Share project with other groups" page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:49:53 +02:00
Dmitriy Zaporozhets 5d2e637c17 Group selectbox js 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:48 +02:00
Dmitriy Zaporozhets 27ee0fc57b Helper for ajax group selectbox 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-30 11:46:47 +02:00