home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 14:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
2524 Commits
Author SHA1 Message Date
Robert Speicher cad0e848b0 Fix and style the "Changes suppressed" link. 2015-07-23 16:07:45 -04:00
Stan Hu ae3f869fd1 Fix the "Reload with full diff" URL button 
On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to diff.json.

Closes #2041
 2015-07-23 12:53:54 -07:00
Douwe Maan 70a3c165a9 Allow custom label to be set for authentication providers. 2015-07-23 15:20:12 +02:00
ngentile dbff6bc106 Gitlab Issue 707: Indent unfolded code 1 character 2015-07-22 09:58:17 -04:00
Daniel Gerhardt 65bd871be7 Fix full screen mode for snippet comments 
ZenMode is now initialized for snippet pages.

Fixes #2036.
 2015-07-21 19:51:16 +02:00
Robert Speicher f92bbd2f28 Show the first tab automatically on MergeRequests#new 
Closes #2013
 2015-07-18 18:05:07 -04:00
Stan Hu 895d988d55 Merge branch 'fix-note-edit-upload-link' into 'master' 
Fix file upload dialog for comment editing

This fixes the file upload dialog which currently works for new comments
but not for comment editing. The cause for this is a missing DOM class
which causes traversal to the dropzone to fail.

This is fixed by adding the expected `gfm-form` class to the edit form.
It has to be added dynamically since adding it to the form template
would break the form's layout and comment saving.

The following screenshot illustrates the issue:
![gitlab-dropzone-upload-dialog-bug](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3a9885c8ba7c07338148ec9e605e5771/gitlab-dropzone-upload-dialog-bug.png)

See merge request !956
 2015-07-18 06:06:59 +00:00
Daniel Gerhardt 7825001586 Fix file upload dialog for comment editing 
This fixes the file upload dialog which currently works for new comments
but not for comment editing. The cause for this is a missing DOM class
which causes traversal to the dropzone to fail.

This is fixed by adding the expected `gfm-form` class to the edit form.
It has to be added dynamically since adding it to the form template
would break the form's layout and comment saving.
 2015-07-17 21:15:52 +02:00
Stan Hu 5bac64552d Fix bug where clicking on the link icon on a file would result in "L#undefined" in the URL 
Closes #2002
 2015-07-17 07:32:17 -07:00
Dmitriy Zaporozhets a7fded9b95 Huge refactoring for accepting merge requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-16 16:03:07 +02:00
Dmitriy Zaporozhets 2280cb23d4 Merge branch 'nice-scroll-sidebar' into 'master' 
Add nice scroll for sidebar

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

See merge request !978
 2015-07-14 10:48:21 +00:00
Dmitriy Zaporozhets 98cb6256fa Add nice scroll for sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-14 12:29:57 +02:00
Kamil Trzcinski 2def2cc60a Hide scrollbar from sidebar when external mouse is connected to OSX 2015-07-14 12:02:42 +02:00
Dmitriy Zaporozhets 5c53dc5a1e Merge branch 'project-default-view' into 'master' 
Allow user to specify content he wants to see on project page

Improvement to !938. Since a lot of people complain on fact they don't like to see README.
Especially since we already have a switcher for dashboard - it kind of acceptable to select behaviour.

User can specify which content he/she wants to see:

![Screenshot_2015-07-13_18.24.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d237474e8f52df4a62ba7e951fa28bd8/Screenshot_2015-07-13_18.24.31.png)

![Screenshot_2015-07-13_18.24.36](https://gitlab.com/gitlab-org/gitlab-ce/uploads/473b0e2a94b3de16d048b8332b539816/Screenshot_2015-07-13_18.24.36.png)

cc @JobV @jacobvosmaer @marin @sytses

See merge request !970
 2015-07-14 08:30:46 +00:00
Dmitriy Zaporozhets 24ecc9049f Increase padding between menu items a bit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 19:24:41 +02:00
Dmitriy Zaporozhets a839b2afc4 Make sidebar scrollable. It prevents content overflow for small screens 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 19:23:15 +02:00
Dmitriy Zaporozhets 5f34759ecb Allow user to specify content he wants to see on project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 18:24:15 +02:00
Dmitriy Zaporozhets 62da53af33 Hide icon for bact-to-location menu in sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 11:56:08 +02:00
Dmitriy Zaporozhets 98291295a7 Merge branch 'rs-issue-1908' into 'master' 
Add Safari/iOS and Windows 8 logo information

Now that we've got our 🔥 new logo, let's spread it around a bit more!

Closes #1908

See merge request !944
 2015-07-13 08:54:56 +00:00
Robert Speicher 353dc1e83e Update background color for touch-icon-* images 2015-07-10 14:03:56 -04:00
Daniel Gerhardt 1ea2dfa5de Do not add the same icon multiple times to dropzones 
Some DOM queries were to broad which caused paperclip icons and spinners
to be added multiple times to a dropzone in case of multiple dropzones
on a page.
 2015-07-10 19:46:40 +02:00
Dmitriy Zaporozhets 8902253e0d Smaller font and leing height for sidebar elements 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-10 15:33:10 +02:00
Robert Speicher 4498de4867 Reset ul list style types inside notes 
Closes #259
 2015-07-09 15:10:59 -04:00
Robert Speicher df64e0db08 Style all blockquote children, not just p 
Closes #1939
 2015-07-09 14:50:09 -04:00
Dmitriy Zaporozhets 1bf3e1578a Properly render plain readme 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-09 11:36:09 +02:00
Robert Speicher c4330d97b1 Add Windows 8 pinned site tile meta tags 2015-07-09 01:43:48 -04:00
Robert Speicher 6591485562 Add Safari/iOS versions of the logo 2015-07-09 01:43:46 -04:00
Dmitriy Zaporozhets 39a4bb2abd Cleanup and some test fixes after refactoring project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 16:55:04 +02:00
Dmitriy Zaporozhets 17156cf909 Imrpove mobile view for project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 13:34:05 +02:00
Dmitriy Zaporozhets 8404ab46b9 Add shortcut for project activity page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 12:43:46 +02:00
Dmitriy Zaporozhets c2f02fc1a4 Refactor star and fork buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 12:25:34 +02:00
Dmitriy Zaporozhets d192f921c1 Move project activity to separate tab. Add more features to project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-07 16:01:12 +02:00
Dmitriy Zaporozhets 5e7f7f8d31 Redesign project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-07 15:22:56 +02:00
Dmitriy Zaporozhets 9860ab0f22 Remove sticky-diff functionality 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-06 11:34:37 +02:00
Dmitriy Zaporozhets 919e702c86 Revert "Diff headers made sticky" 
This reverts commit af44c65030.
 2015-07-06 11:30:30 +02:00
Nicolás Reynolds 2662c7932a commit hashes are monospaced 2015-07-01 13:33:29 -03:00
Robert Speicher f6503f71f9 Remove disableButtonIf[Any]EmptyField calls from forms 
These have been replaced by the "requiresInput" behavior.
 2015-06-26 22:07:59 -04:00
Robert Speicher e4472cee78 Add "Requires Input" JS behavior 2015-06-26 22:06:42 -04:00
Dmitriy Zaporozhets 06ab7d89f9 Merge branch 'rs-issue-1887' into 'master' 
Reorder MergeRequestTabs constructor

The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.

Fixes #1887

See merge request !892
 2015-06-26 16:17:07 +00:00
Dmitriy Zaporozhets d5947ada44 Simplify set of assignee, milestone and label to admin_issue rule 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:45:45 +02:00
Dmitriy Zaporozhets b9fa82daee Update tests and use js-issuable class for context form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-26 15:05:30 +02:00
Robert Speicher d2b5c3f6ce Trigger sticky_kit:recalc when diffs are pre-loaded 2015-06-25 21:26:20 -04:00
Robert Speicher 4e7f23fe0b Reorder MergeRequestTabs constructor 
The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.

Fixes #1887
 2015-06-25 18:33:24 -04:00
Dmitriy Zaporozhets a9095280c7 UsersSelect is part of filter so I rather keep js executed in partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:54:35 +02:00
Dmitriy Zaporozhets cbb64a4f63 Fix js error on merge request page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:37:52 +02:00
Dmitriy Zaporozhets 5ff870a044 Move duplicate js functionality into IssuableForm 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:17:06 +02:00
Dmitriy Zaporozhets 2d31568b27 Refactor issue and merge request sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-25 16:04:50 +02:00
Dmitriy Zaporozhets 6288677134 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-25 13:33:50 +02:00
Douwe Maan 7b804e231a Have sidebar labels disappear behind content instead of hide immediately. 2015-06-25 11:42:15 +02:00
Job van der Voort 0429a24066 prettier highlighting of active link in the sidebar 2015-06-25 11:19:56 +02:00