home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,841 Commits 48 Branches 340 Tags
541da4d51f3e8abfccbbfc7301d8c133fd0fcd35
Commit Graph
1001 Commits
Author SHA1 Message Date
Douwe Maan 541da4d51f Merge branch 'issue_4189' into 'master' 
Fix redirect to wrong URL when merging and MR detail URL has an anchor.

Closes #4189

See merge request !2169
 2015-12-24 11:41:36 +00:00
Valery Sizov e622259d5b Merge branch 'emoji-picker-fix' into 'master' 
Emoji picker: better alias handling

related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3576

See merge request !2198
 2015-12-24 11:24:03 +00:00
Valery Sizov b6de0d2830 Emoji picker: better alias handling 2015-12-24 11:28:55 +02:00
Jacob Schatz 3ece40c222 fixes the search for projects 2015-12-23 18:27:38 -05:00
Dmitriy Zaporozhets c53742b14d Merge branch 'rs-update-jquery' into 'master' 
Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0

Closes #2859 

See merge request !2183
 2015-12-23 12:05:48 +00:00
Robert Speicher 5ad192ced2 Fix paths for jquery-ui assets 2015-12-22 17:14:01 -05:00
Valery Sizov a56d357be0 TYPO in the comment 2015-12-22 23:12:23 +02:00
Valery Sizov a48dd40a92 base implementation of emoji picker [ci skip] 2015-12-22 23:12:23 +02:00
Rubén Dávila 42da7cd375 Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189 2015-12-21 22:59:15 -05:00
Dmitriy Zaporozhets 4b7c9c7fe2 Revert sidebar position for issue and merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-17 10:34:15 +01:00
Douwe Maan 79c90821ac Rename .issuable-details to .detail-page (and -header and -description) 2015-12-16 16:13:22 +01:00
Dmitriy Zaporozhets b4ea6ad16a Few UI improvements to new sidebar implementation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Dmitriy Zaporozhets aa5bf4097b Make edit link on issuable sidebar works 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-11 20:11:23 +01:00
Robert Speicher 48eccdb2fc Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master' 
Fix delete notes on merge request diff

Fixes #3971

See merge request !2061
 2015-12-11 12:49:55 -05:00
Douwe Maan a2a68858c8 Merge branch 'feature/project_js_from_ee' into 'master' 
Aling project js with EE

The MR ports the changes introduced by gitlab-org/gitlab-ee!70 in `project.js.coffee`.  


See merge request !2054
 2015-12-11 15:13:26 +00:00
Grzegorz Bizon d1211e0ada Fix award-emojis alert flash message 
This adds a new feature to `Flash` that allows to pin it after a
specified selector. This removes a fixed position from such award-emoji
alert, and makes it responsive by design of selector that this alert is
pinned to.

Closes #3996
 2015-12-11 13:50:14 +01:00
Valery Sizov 72b7d1f59d emoji aliases problem 2015-12-11 13:17:12 +02:00
Douglas Barbosa Alexandre 1f893022fd Remove note from MR discussion when deleting it in the changes tab 2015-12-10 22:07:25 -02:00
Douglas Barbosa Alexandre 9d6e5f0a28 Make selectors more specific when scroll to element 2015-12-10 15:42:00 -02:00
Douglas Barbosa Alexandre 67913670dc Make selectors more specific when setting the tab content 
Reason: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2023
 2015-12-10 13:50:31 -02:00
Douglas Barbosa Alexandre 0c54c9a8a3 USe innerHtml to avoid slow performance on a MR with very large diff 2015-12-10 13:42:10 -02:00
Borja Aparicio 01cafa1d90 Aling project js with EE 2015-12-10 16:27:34 +01:00
Douglas Barbosa Alexandre 429932a8b4 Ensure new notes are highlighted properly on a merge request diff 2015-12-09 12:17:00 -02:00
Douglas Barbosa Alexandre 05f06955ba Ensure existing notes are highlighted properly on a merge request diff 2015-12-09 12:16:54 -02:00
Douglas Barbosa Alexandre 9e5ac7285c Ensure notes are replaced on a merge request diff when they're updated 2015-12-09 11:30:21 -02:00
Douwe Maan 23b6a98de0 Move Builds tab to the end 2015-12-08 22:28:28 +01:00
Douwe Maan 6c94a44295 Merge branch 'master' into mr-builds 
# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml
 2015-12-08 22:26:29 +01:00
Dmitriy Zaporozhets 7234610010 Merge remote-tracking branch 'origin/ui/misc' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-08 18:50:02 +01:00
Dmitriy Zaporozhets 98368d6ec8 Merge branch 'fix-broken-group-avatar-upload' into 'master' 
Fix broken group avatar upload

Closes #3918

See merge request !2018
 2015-12-08 17:02:50 +00:00
Stan Hu 3d654cc0fa Fix broken group avatar upload 
Closes #3918
 2015-12-08 07:52:08 -08:00
Douwe Maan 15925290ee Merge branch 'master' into ui/dashboard-new-issue 2015-12-08 15:22:04 +01:00
Douwe Maan 1567572e79 Add Builds tab to MR detail page 2015-12-08 13:11:41 +01:00
Douwe Maan 3c80a54315 Merge branch 'master' into ui/misc 2015-12-08 12:50:25 +01:00
Dmitriy Zaporozhets bdb4945dcf Fix random failing test - delete attachment 
Make sure we wait for AJAX request to finish before end test and cleanup
database

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-07 23:40:17 +01:00
Douwe Maan 6fb90a2ca3 Include groups in dashboard "New Milestone" select. 2015-12-07 17:24:15 +01:00
Douwe Maan 5a9a8d03a7 Merge branch 'master' into ui/dashboard-new-issue 2015-12-07 17:12:29 +01:00
Douwe Maan cbcb8dbe70 Use select2 dropdown for dashboard/group 'New X' buttons 2015-12-07 17:12:04 +01:00
Douwe Maan dddfbb653e Merge branch 'master' into ui/misc 2015-12-07 13:48:18 +01:00
Grzegorz Bizon 359d94607c Merge branch 'fix/award-emoji-conflict-in-notes' into 'master' 
Fix problems with award-emoji-only comment

This fixes a conflict between note with only a single emoji in content
and award-emojis mechanisms.

Closes #3734 

cc @vsizov

See merge request !1936
 2015-12-07 12:26:56 +00:00
Grzegorz Bizon bfe91b692a Remove space before exclamation mark in award alert 
[ci skip]
 2015-12-05 22:18:13 +01:00
Andrew Tomaka 1c53dc28b5 Notify user if they cannot create projects 2015-12-05 11:32:08 -05:00
Rubén Dávila aa1ba00936 Ensure "Remove Source Branch" button is not shown when branch is being deleted. #3583 2015-12-04 10:43:33 -05:00
Dmitriy Zaporozhets abf54f230e Merge branch 'ui/sidebar' into 'master' 
UI: Sidebar & header tweaks and fixes

Depends on !1953 

See the commits for more details, the messages mostly speak for themselves.

![Logo](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ba088150165bb0a0aea1e894f3443f43/logo_tooltip.png)

![Sidebar](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1e8c09ac3bf489cdb9531eebea18c90/sidebar_tooltips.png)

Fixes #2928, #2071, https://dev.gitlab.org/gitlab/gitlabhq/issues/2575, and https://dev.gitlab.org/gitlab/gitlabhq/issues/2573

See merge request !1958
 2015-12-04 09:31:28 +00:00
Grzegorz Bizon 7af67f619a Combine new javascript Flash methods into one 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 554f468462 Pin flash message to top if award note is invalid 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 70a076c059 Add new features to javascript flash message 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 6fc1b94856 Show flash message instead of alert when note is invalid 2015-12-03 13:39:00 +01:00
Grzegorz Bizon a527f5c27f Notify user when award-emoji comment is invalid 2015-12-03 13:38:59 +01:00
Grzegorz Bizon c92b6e66dc Scroll to awards after adding emoji-award comment 
This makes it more intuitive, as user can see that something actually
happened after adding emoji-only comment in long discussions.
 2015-12-03 13:38:59 +01:00
Douwe Maan c12e4de50c Move "Start new merge request" checkbox closer to New branch field 2015-12-02 14:57:38 +01:00