home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,340 Commits 48 Branches 340 Tags
c857c7ff1cc59ca74a2beb88e25c2fc9802ea9a6
Commit Graph
859 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Robert Speicher 29626b0885 Remove unused showAndHide, simpleFormat, and linkify functions 
Also removes redundant `unbind` call
 2015-06-02 20:32:07 -04:00
Robert Speicher 4560954404 Move jQuery enable/disable extensions to extensions/jquery 
Removes redundant enableButton/disableButton extensions, and adds specs
for the jQuery extensions.
 2015-06-02 20:32:07 -04:00
Robert Speicher f76a3f3db7 Add ZenMode javascript specs 2015-06-02 20:32:07 -04:00
Dmitriy Zaporozhets 01f6ae2351 improve navbar collapse for mobile views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 17:55:20 +02:00
Dmitriy Zaporozhets aa97325dea Merge branch 'rs-merge-request-tabs-the-third' into 'master' 
Include location.search and location.hash in URL for replaceState

Forgot these 😊

See merge request !740
 2015-05-29 10:23:33 +00:00
Robert Speicher 7f529ef0f7 Include location.search and location.hash in URL for replaceState 2015-05-29 05:15:09 -04:00
Dmitriy Zaporozhets acb7721fe8 Merge branch 'rs-teaspoon' into 'master' 
Add Teaspoon for Javascript testing

Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect.

See https://github.com/modeset/teaspoon

See merge request !715
 2015-05-29 09:10:46 +00:00
Robert Speicher 3f156ed482 Improve MergeRequest tab-persisting behavior 
Now uses the path instead of the hash.

See discussion in #728.
 2015-05-29 00:27:56 -04:00
Robert Speicher 73440b0364 Javascripts don't need to require jquery or bootstrap explicitly 2015-05-28 18:22:32 -04:00
Robert Speicher 5c52eaa9d2 Persist current merge request tab selection via URL 
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
 2015-05-27 22:39:11 -04:00
Douwe Maan 97f9d601cc Merge branch 'fix-safari-clone-url' into 'master' 
Fix clone URL losing selection after a single click in Safari and Chrome

### What does this MR do?

This MR deactivates the mouseup event in the `git clone` URL to prevent the text from being deselected after a single click.

### Why was this MR needed?

In Safari and Chrome 43.0.2357.65 (42.0.2311.152 worked fine), the URL would lose selection after a single click. To reproduce:

1. Go to https://gitlab.com/gitlab-org/gitlab-ce
2. Click on the URL in the repository (HTTP is selected by default).
3. Click on the SSH button.
4. Click on the URL again.

The URL selection should be selected automatically, but it is deselected immediately.

It appears that 92544df changed the selection event from `click` to `focusin` to make copy & paste work in X11. This Stack Overflow article discusses the deselection issue in detail:

http://stackoverflow.com/questions/3380458/looking-for-a-better-workaround-to-chrome-select-on-focus-bug

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9326

See merge request !698
 2015-05-27 12:26:41 +00:00
Douwe Maan 106cb511de Merge branch 'support-file-attachments-milestones' into 'master' 
Add file attachment support in Milestone description

### What does this MR do?

This MR adds support for attaching files to Milestone descriptions.

### Why was this MR needed?

Dropzone support should be in every Markdown area. It seems that this one was overlooked.

### What are the relevant issue numbers?

Closes #1648

See merge request !712
 2015-05-27 12:17:34 +00:00
Dmitriy Zaporozhets 2cd1cee639 Merge branch 'commit-graphs-by-email' into 'master' 
Group project contributions by both name and email.

See https://twitter.com/Argorain/status/598751646143897600.

We now group by both name and email, so that "Douwe Maan - douwe@gitlab.com", "Douwe Maan - me@douwe.me" and "Douwe M. - me@douwe.me" are all combined into one graph.

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2328.

See merge request !700
 2015-05-27 11:45:53 +00:00
Jeroen van Baarsen aa36a19613 Merge pull request #9319 from jvanbaarsen/validate-wiki-page-creation 
Validate wiki page creation
 2015-05-26 20:05:25 +02:00
Robert Schilling 5c2acc51e2 Merge branch 'fix-escape-key-in-zen-mode' into 'master' 
Fix Zen Mode not closing with ESC key

### What does this MR do?

This MR fixes the ESC key not leaving Zen Mode (fullscreen).

### Why was this MR needed?

This has been broken since GitLab v7.8. The `change` event for `zen-toggle-comment` was never fired. See:

http://stackoverflow.com/questions/19505011/checkbox-checked-with-prop-does-not-fire-events-attached-to-change?answertab=votes#tab-top

### What are the relevant issue numbers?

* Closes #1025
* Closes https://github.com/gitlabhq/gitlabhq/issues/9018

See merge request !710
 2015-05-26 17:26:28 +00:00
Jeroen van Baarsen b16aad9dd1 Validate wiki page creation 
**What does this do?**
It adds validation to the creation of a wiki page, that way the user gets real
feedback instead of just a 404 page if the name of the wiki page was invalid

**Why is this needed?**
There are a lot of characters that are not allowed in the creation of a wiki
page, there is even a small text that is saying: Please don't use spaces.
Although we have that text there, we don't actually validate on this. This
commit adds validation on the title and gives the user actual feedback.

**What issues does this fix?**
Fixes http://github.com/gitlabhq/gitlabhq/issues/5357
Fixes https://github.com/gitlabhq/gitlabhq/issues/8565
Fixes https://github.com/gitlabhq/gitlabhq/issues/3913
Fixes https://github.com/gitlabhq/gitlabhq/issues/8166

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-05-26 19:01:11 +02:00
Stan Hu 8c3c5afba2 Add file attachment support in Milestone description 
Closes #1648
 2015-05-25 21:41:47 -07:00
Stan Hu ae552ec315 Fix Markdown preview not working in Edit Milestone page 
Closes #1687
Closes https://github.com/gitlabhq/gitlabhq/issues/9325
 2015-05-25 21:03:55 -07:00
Stan Hu 710627fbd8 Fix Zen Mode not closing with ESC key 
Closes #1025
 2015-05-25 20:27:20 -07:00
Douwe Maan 2fa5c7513e Group project contributions by both name and email. 2015-05-25 15:43:22 +02:00
Stan Hu 310e08dc2c Fix clone URL losing selection after a single click in Safari and Chrome 
Closes #9326
 2015-05-24 20:19:26 -04:00
Douwe Maan cbcc5f8544 Workaround that doesn't add unwanted newline. 2015-05-21 11:22:21 +02:00
Robert Speicher 8e40d594a2 Work around a Chrome 43 bug preventing note editing 2015-05-20 12:53:35 -04:00
Robert Speicher bd85e8ea5a Fix default tooltip placement 2015-05-17 18:13:27 -04:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Dmitriy Zaporozhets 15bbb4ee1a Merge pull request #9244 from dreis2211/firefox_issuable_filter_patch 
Fix Firefox problems when it wants to render issuable component
 2015-05-08 22:24:51 +03:00
Robert Speicher d5ee54df16 More JS dependency requirements 2015-05-06 15:31:08 -04:00
Robert Speicher c96c7cbfb1 Make issue JS require its dependencies 2015-05-06 13:00:14 -04:00
Robert Speicher 968c281f40 Make notes JS require its dependencies 2015-05-06 13:00:14 -04:00
Robert Speicher ce29e5cd8f Update task list behavior for Merge Requests 2015-05-06 12:58:27 -04:00
Robert Speicher 922497560e Update task list behavior for Notes 2015-05-06 12:58:27 -04:00
Robert Speicher a3d55db910 Update task list behavior for Issues 2015-05-06 12:58:27 -04:00
Robert Speicher 18baf550e1 Add task_list JS 2015-05-06 12:58:27 -04:00
Robert Speicher 5ef8bd33d0 Remove taskable.js 2015-05-06 12:58:27 -04:00
dreis a1152e19d1 Fix Firefox problems when it wants to render issuable component 2015-05-05 21:52:06 +02:00
Douwe Maan 2bb2ade50d Merge branch 'master' into license 
# Conflicts:
#	db/schema.rb
 2015-05-05 13:03:33 +02:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02:00
Douwe Maan d1f2b09fad Allow license to be uploaded and enforce its validity. 2015-05-01 14:52:30 +02:00
Douwe Maan 92fd3ccee0 Add helpers for header title and sidebar, and move setting those from controllers to layouts. 2015-05-01 10:39:16 +02:00
Dmitriy Zaporozhets 2e243fc321 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	README.md
	VERSION
	app/controllers/projects/services_controller.rb
	app/controllers/projects/uploads_controller.rb
	app/services/test_hook_service.rb
	db/schema.rb
	features/steps/admin/settings.rb
	lib/gitlab/reference_extractor.rb
	spec/models/note_spec.rb
 2015-04-27 11:53:31 +03:00
Robert Speicher 1e1785cc16 Place the logo's tooltip dynamically 
When collapsed it's on the right like everything else, when expanded
it's on the bottom.
 2015-04-25 16:03:18 -04:00
Robert Speicher d30ceda7de Add collapsed navbar links to the default tooltip selector 2015-04-25 16:00:30 -04:00
Robert Speicher e8faf9178a Remove the has_bottom_tooltip class 
Bootstrap's tooltip JS can read the placement from a `data-placement`
attribute.

Further, when we supply the `selector` option to `tooltip`, tooltips
will be added to any dynamically-added elements matching the selector,
without us having to re-call the `tooltip` method.
 2015-04-25 14:03:40 -04:00
Dmitriy Zaporozhets f502b293e5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	spec/helpers/gitlab_markdown_helper_spec.rb
 2015-04-24 11:22:54 +03:00
Robert Speicher 85bbb91476 Fix GfmAutoComplete for jquery-atwho 1.0 2015-04-23 13:08:16 -04:00
Dmitriy Zaporozhets 71f6143552 Merge branch 'master' into new-sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/snippets_controller.rb
 2015-04-23 12:08:03 +03:00
Dmitriy Zaporozhets a22f3139f3 Merge branch 'rs-reply-hotkey' into 'master' 
"Reply quoting selected text" shortcut/hotkey

Adds the <kbd>r</kbd> hotkey for quoting selected text on Issuable forms.

This MR also updates the jasmine gem and adds jasmine-rails to let us use the asset pipeline (and Coffeescript) in JS specs.

See merge request !1775
 2015-04-22 19:57:40 +00:00
Dmitriy Zaporozhets 4860c4dc07 Fix toggle of sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-22 16:48:39 +03:00
Douwe Maan 2400181a3a Merge branch 'fix-cannot-move-project-error' into 'master' 
Fix "Cannot move project" error message from popping up after a successful transfer

The JavaScript click handlers were never being removed, leading to duplicate requests when attempting to transfer a project to another namespace. The first transfer would succeed but the subsequent ones would fail, leading to the error message saying, "Cannot move project".

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/0c9f61294291514e0c2a48c204b6a1aa/image.png)

I attempted to write a unit test for this, but it was taking me too long to get it right.

Closes #1448 and #1128

See merge request !548
 2015-04-21 09:29:17 +00:00