home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan f905fd239c Use URL helpers in specs 2015-12-03 14:00:09 +01:00
Grzegorz Bizon 83d8185f5a Make method supports_award? public in Note 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 7af67f619a Combine new javascript Flash methods into one 2015-12-03 13:39:00 +01:00
Grzegorz Bizon f08f921d53 Support emoji awards also in merge requests 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 2b57755117 Add feature test for emoji-only diff notes 
This specs is related to bug described in #3734 (award-emojis).
 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 4676ba1f7c Add test for award-emoji being added as regular comment 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 bfce5d7168 Render json message with errors if note didn't pass validation 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
Grzegorz Bizon ba08811d07 Move note emoji-award implementation to note model (feature envy) 2015-12-03 13:38:59 +01:00
Grzegorz Bizon 22d87b74a9 Support award-emoji notes only when it a comment for an issue 2015-12-03 13:38:59 +01:00
Grzegorz Bizon 9cf67f72a5 Add validator for award-emoji note 2015-12-03 13:38:59 +01:00
Douwe Maan 0dcff1342b Merge branch 'master' into reference-pipeline-and-caching 2015-12-03 13:34:25 +01:00
Douwe Maan 928d131e39 Merge branch 'master' into link-refs 2015-12-03 13:32:42 +01:00
Douwe Maan 3b70d5b207 Merge branch 'master' into fork-event 2015-12-03 13:32:16 +01:00
Douwe Maan 97ddf2df00 Merge branch 'master' into ui/wiki 2015-12-03 13:29:35 +01:00
Douwe Maan 66a9579712 Merge branch 'master' into ui/sidebar 
# Conflicts:
#	app/assets/stylesheets/framework/sidebar.scss
 2015-12-03 13:29:19 +01:00
Douwe Maan e84edc20c3 Merge branch 'master' into ui/project-home-panel 2015-12-03 13:28:20 +01:00
Douwe Maan fc5afc60ac Merge branch 'master' into ui/new-project 2015-12-03 13:28:08 +01:00
Douwe Maan 7d3edf2520 Merge branch 'master' into ui/misc 2015-12-03 13:27:39 +01:00
Douwe Maan f3de9d784c Merge branch 'master' into ui/milestones 2015-12-03 13:27:11 +01:00
Douwe Maan 00ebe2239b Merge branch 'master' into ui/issuable-list-item 2015-12-03 13:26:02 +01:00
Douwe Maan 879d1f9b76 Merge branch 'master' into ui/issuable-form 2015-12-03 13:25:31 +01:00
Douwe Maan ac8972668f Merge branch 'master' into ui/issuable-filter 2015-12-03 13:24:31 +01:00
Douwe Maan 535d9306c1 Merge branch 'master' into ui/emoji 2015-12-03 13:24:19 +01:00
Douwe Maan 66affb83fb Merge branch 'master' into ui/dashboard-new-issue 2015-12-03 13:23:43 +01:00
Douwe Maan 0520cd7164 Merge branch 'master' into ui/form-consistency 2015-12-03 13:21:19 +01:00
Douwe Maan 129ad8425e Tweak tag form wording 2015-12-03 13:21:14 +01:00
Valery Sizov 6689224a90 Merge branch 'fix_master' into 'master' 
Fix failures in master



See merge request !1974
 2015-12-03 12:05:32 +00:00
Valery Sizov b871c38bf2 Fix failures in master 2015-12-03 13:21:30 +02:00
Dmitriy Zaporozhets b4b67b020a Merge branch 'deprecated_warnings' into 'master' 
Git rid of deprecated warnings after rails update

https://gitlab.com/gitlab-org/gitlab-ce/issues/3798

https://gitlab.com/gitlab-org/gitlab-ce/issues/3797

See merge request !1946
 2015-12-03 09:41:15 +00:00
Valery Sizov 843df4edd4 Merge branch 'test_fix' into 'master' 
Fix broken spec related to MySQL and fractional seconds support.



See merge request !1973
 2015-12-03 09:27:36 +00:00
Valery Sizov f21bbd4444 Rails deprecation warning about log_level 2015-12-03 10:53:58 +02:00
Valery Sizov 54b74aa998 fix Celluloid warnings 2015-12-03 10:49:02 +02:00
Valery Sizov 162cd0099c fix deprecation messages in tests 2015-12-03 10:33:43 +02:00
Rubén DávilaandValery Sizov f94afdbdb2 Fix broken spec related to MySQL and fractional seconds support. 2015-12-03 09:30:50 +02:00
Douglas Barbosa Alexandre f1bbd8119d Style warning about mentioning many people in a comment 2015-12-02 22:03:43 -02:00
Dmitriy Zaporozhets ca7e31c48f Merge branch 'ui/consistency' into 'master' 
UI: Improve consistency across the board

Depends on !1953

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

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2577

See merge request !1954
 2015-12-02 22:17:48 +00:00
Dmitriy Zaporozhets bb76a9e2ea Merge branch 'ui/no-minimal-height' into 'master' 
UI: Remove minimum container height

Depends on !1953

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

Before:

![Screen_Shot_2015-12-02_at_15.42.07](/uploads/1d8e19e4738bec39074cbb9afc400ad5/Screen_Shot_2015-12-02_at_15.42.07.png)

After:

![Screen_Shot_2015-12-02_at_15.50.34](/uploads/56153fe19bb72163a2dc9dd83850ad89/Screen_Shot_2015-12-02_at_15.50.34.png)


See merge request !1957
 2015-12-02 22:15:38 +00:00
Dmitriy Zaporozhets 858e8903bf Merge branch 'ui/gl-padding' into 'master' 
UI: More consistent alignment and padding

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

# Highlights:

## Merge request form bottom

Before:

![mr_before](/uploads/de2ae608d300784b61818bc33538ac64/mr_before.png)

After: 

![mr_after](/uploads/9b1568d8287704ee9497cc029e827778/mr_after.png)

## Issue header

Before:

![issue_before](/uploads/e8cc4fb316219f025ff7bd74c7da8677/issue_before.png)

After:

![issue_after](/uploads/5fbad99f038571196c3c3c2bea304381/issue_after.png)

## Empty repository message

Before:

![empty_before](/uploads/f6ab80aea9af9111c3dc260d5fa98cd6/empty_before.png)

After:

![empty_after](/uploads/40a528f5a45f4e47776356c88aab24c4/empty_after.png)

Fixes #3742 and https://dev.gitlab.org/gitlab/gitlabhq/issues/2594

See merge request !1953
 2015-12-02 22:14:42 +00:00
Hannes Rosenögger 5453eb7d79 Merge branch 'workhorse_in_patch_update' into 'master' 
Also update gitlab-workhorse in patch updates [ci skip]

Fixes #3747 

See merge request !1959
 2015-12-02 20:36:16 +00:00
Stan Hu cc52513367 Merge pull request #9873 from atomaka/atomaka/feature/prevent-blocked-impersonation 
Prevent impersonation if blocked
 2015-12-02 11:14:02 -08:00
Andrew Tomaka ec754d2213 Be more explicit with the impersonate return URL 2015-12-02 13:21:07 -05:00
Douwe Maan 044e0e33dc Allow invalid URLs in closing pattern 2015-12-02 18:48:39 +01:00
Douwe Maan f10bd7df90 Tweak merge request list item 2015-12-02 17:37:06 +01:00
Douwe Maan 74a81cbfe3 Fix branch rendering 2015-12-02 17:30:50 +01:00
Job van der Voort efead2cf16 Merge branch 'fix_permission_doc' into 'master' 
fixed the documentation of the Guest role in permission.md

This MR fixes the documentation of the Guest role.  

closes gitlab-org/gitlab-ce#3777 

cc @dblessing @JobV 

See merge request !1952
 2015-12-02 15:26:44 +00:00