home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,658 Commits 48 Branches 340 Tags
492249f9345fbc09a2b79cb8083bcbcdcef102b3
Commit Graph
2344 Commits
Author SHA1 Message Date
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 4146ce559e Merge branch 'profile-in-sidebar' into 'master' 
Move user avatar and logout button to sidebar

Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2272

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !719
 2015-05-27 11:52:53 +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
Dmitriy Zaporozhets 56ab471f98 Move user avatar and logout button to sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-27 13:17:14 +02:00
Dmitriy Zaporozhets 3ed05b2191 Merge branch 'rs-manual-2fa-entry' into 'master' 
Add support for manually entering 2FA details

> ![Screen_Shot_2015-05-22_at_6.39.26_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/27b6cc0b2f88e0ccec234dd8d20db957/Screen_Shot_2015-05-22_at_6.39.26_PM.png)

Related to #1679 though I'm not sure if it entirely fixes it, since I don't have access to a Windows Phone.

See merge request !694
 2015-05-27 09:53:40 +00:00
Dmitriy Zaporozhets f955554d0f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-26 20:32:55 +02:00
Dmitriy Zaporozhets a94dc7319c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-05-26 20:32:23 +02:00
Dmitriy Zaporozhets b11bcb8a74 Use default control for search field in header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-26 20:32:11 +02: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
Robert Speicher e73ea12695 Add support for manually entering 2FA details 2015-05-23 15:04:40 -04:00
Douwe Maan 7298d05cc0 Merge branch 'rs-issue-1568' into 'master' 
Work around a Chrome 43 bug preventing note editing

Fixes #1568 - and I mean "fixes"

I have no idea what causes this or why this fixes it and can't dig into it further right now, but the bug seems like a blocker so this needs to be fixed for 7.11.

See merge request !684
 2015-05-21 09:31:59 +00:00
Douwe Maan cbcc5f8544 Workaround that doesn't add unwanted newline. 2015-05-21 11:22:21 +02:00
Job van der Voort 3a3f4b41e6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-21 10:38:22 +02:00
Robert Speicher 8e40d594a2 Work around a Chrome 43 bug preventing note editing 2015-05-20 12:53:35 -04:00
Robert Speicher 8ee382087d Subclass TaskList::Filter to fix a bug 
Instead of using a fork, we subclass the filter and only apply the
`task-list` class to list items that actually are task lists.

Closes #1645

See https://github.com/github/task_list/pull/60
 2015-05-20 12:08:33 -04:00
Dmitriy Zaporozhets 76a758234a Merge branch 'explain-wip-mr' into 'master' 
Add explanation about WIP status to MR form.

![Screen_Shot_2015-05-15_at_13.48.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b3f70585255a043f07c61570549a90ba/Screen_Shot_2015-05-15_at_13.48.49.png)

![Screen_Shot_2015-05-15_at_13.49.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c9992708c8ef5ef4fa2bcc2c3173b8e3/Screen_Shot_2015-05-15_at_13.49.01.png)

See merge request !666
 2015-05-20 12:08:51 +00:00
Dmitriy Zaporozhets 15a6211e81 Small css improvements 2015-05-19 21:15:41 +03:00
Dmitriy Zaporozhets f931904297 Merge branch 'rs-issue-1626' into 'master' 
Fix labels for project/snippet visibility selection

Closes #1626

See merge request !671
 2015-05-18 08:41:12 +00:00
Robert Speicher bd85e8ea5a Fix default tooltip placement 2015-05-17 18:13:27 -04:00
Robert Speicher 2be995d71c Increase left margin for visibility descriptions 
Now they line up with their title.
 2015-05-16 16:09:32 -04:00
Douwe Maan c74375ae60 Add explanation about WIP status to MR form. 2015-05-15 13:50:04 +02:00
afc163 2738978111 Add style for <kbd> element in markdown 
Fixes #5825
 2015-05-14 23:57:01 +08:00
Douwe Maan 74770137f6 Always show note action icons. 2015-05-14 12:18:19 +02:00
Dmitriy Zaporozhets 091c906131 Fix text overflow in project sidebar 2015-05-13 15:14:02 +03:00
Dmitriy Zaporozhets b0b25e37c9 Merge branch 'note-role' into 'master' 
Show user roles by comments.

I think it would be useful to show the user's role (Owner/Master/Developer/Reporter) by comments on GitLab.com (like GitHub does with Owner/Collaborator). That way people will know that when someone from the project's core team comments, they're not just some random user, but they're actually on the team. Currently they have the gather this from context.

![Screen_Shot_2015-05-12_at_12.15.45](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0da0eea2087d6d3b14a2c0c594575c8a/Screen_Shot_2015-05-12_at_12.15.45.png)

On hover, the note actions replace the role:

![Screen_Shot_2015-05-12_at_12.17.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/54a83c2f5047ea3ce0387f6692b14fe5/Screen_Shot_2015-05-12_at_12.17.32.png)

---

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2321.

cc @sytses

See merge request !639
 2015-05-12 11:28:39 +00:00
Douwe Maan b0af379a22 Show user roles by comments. 2015-05-12 12:16:34 +02:00
Douwe Maan e9dff9f410 Fix alignment of ref picker, breadcrumb and buttons. 2015-05-12 10:27:17 +02: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
Dmitriy Zaporozhets 6c32abc5f7 Merge branch 'rs-task_list' into 'master' 
Use task_list gem for task lists

Task Lists can now be used in comments, and they'll render in previews. 👏

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271

See merge request !599
 2015-05-08 09:39:48 +00:00
Sullivan SENECHAL f972a9e34c Fix bootlint issues on git clone holder bar 2015-05-07 18:32:10 +02:00
Robert Speicher 0cc7536341 Fix header link anchors 2015-05-06 18:38:43 -04: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 421f3f1551 Change padding for task lists in notes 2015-05-06 13:00:13 -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
Dmitriy Zaporozhets 5b3c823fc9 Make header title bold and line between header lighter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 18:27:44 +03:00
Dmitriy Zaporozhets 342078a76d Small UI improvements to make project sidebar more neat 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-06 16:38:45 +03:00