home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 18:46:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,838 Commits 48 Branches 340 Tags
b3e4bc5911737db82f2b296a0eed7fcb59fa28bb
Commit Graph
21838 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Schatz b3e4bc5911 resolves conflicts with new buttons 2015-12-23 17:05:29 -05:00
Jacob Schatz 7e43fa6709 fixes tests to work with jasmine/jquery 2015-12-23 16:56:36 -05:00
Robert Speicher 1100eb0c4e Merge branch 'make-migrations-reversible' into 'master' 
Make migrations reversible

See merge request !2191
 2015-12-23 19:20:07 +00:00
Kamil Trzcinski 89aed37eef Make migrations reversible 2015-12-23 19:39:59 +01:00
Dmitriy Zaporozhets 9f69a0b229 Merge branch 'new-project-button-seperate-from-filter-name' into 'master' 
New project button with filter in header.

Fixes #3943 
![Screen_Shot_2015-12-21_at_3.47.01_PM](/uploads/f7f952440b4bb4b55f62241bbc328c95/Screen_Shot_2015-12-21_at_3.47.01_PM.png)


See merge request !2165
 2015-12-23 16:51:03 +00:00
Dmitriy Zaporozhets 188c13b733 Merge branch 'button-height' into 'master' 
Button height

old
![Screenshot_2015-12-23_15.48.12](/uploads/0e6c5696262475c197f8fcbf00199132/Screenshot_2015-12-23_15.48.12.png)

new
![Screenshot_2015-12-23_15.48.45](/uploads/1d6bdf96f7c90b65f4a6b21df3951370/Screenshot_2015-12-23_15.48.45.png)

also including MR page

See merge request !2188
 2015-12-23 16:14:18 +00:00
Jacob Schatz 327c968037 fixes spacing between new project button and input 2015-12-23 10:48:42 -05:00
Jacob Schatz 8831f5dcb5 moves border bottom to left-menu-top class. 2015-12-23 10:41:29 -05:00
Andriy Dyadyura cee776c143 new button sizes 2015-12-23 16:25:42 +01:00
Dmitriy Zaporozhets f2b00e7ce1 Merge branch 'add-project-permissions' into 'master' 
Add project permissions to all project API endpoints

This standardizes all the project API formats. Also needed to support Huboard.

See merge request !2090
 2015-12-23 15:24:55 +00:00
Dmitriy Zaporozhets 4e29045410 Merge branch 'double-border-on-no-comments' into 'master' 
border bottom for last comment fixes double line issue

Since image uploading isn't working atm. Will upload screenshots when it works again. 
https://unsee.cc/mosapine/
Fixes #3955 

See merge request !2175
 2015-12-23 15:22:54 +00:00
Andriy Dyadyura 5e0b989fca new button sizes 2015-12-23 15:46:13 +01:00
Jacob Schatz 3686b45560 fixing conflict. 2015-12-23 09:10:16 -05:00
Andriy Dyadyura 98a63a499f Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into button-height 2015-12-23 15:07:41 +01:00
Dmitriy Zaporozhets 16a79f56b8 Merge branch 'new-buttons' into 'master' 
New buttons

OLD
![Screenshot_2015-12-22_21.42.59](/uploads/79e85727586f7b917b8ab9ef867e79dc/Screenshot_2015-12-22_21.42.59.png)

NEW
![Screenshot_2015-12-22_21.42.21](/uploads/aee54160f17e0502e14ca5c754dcfe50/Screenshot_2015-12-22_21.42.21.png)


See merge request !2179
 2015-12-23 14:07:10 +00:00
Jacob Schatz 265750c80d adds css for left-top-menu. Also hides buttons in certain for factors. 2015-12-23 09:00:59 -05:00
Andriy Dyadyura 9b3b521d01 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into button-height 2015-12-23 14:47:24 +01:00
Jacob Schatz 48ecb614e7 project header 2015-12-23 08:25:03 -05:00
Grzegorz Bizon e1e39b61e5 Merge branch 'fix/ci-runners-token-persistence' into 'master' 
Fix method that ensures authentication token

Until now, `ensure_#{token_filed_name}!` method didn't persist new token in database.

This closes #4235.

See merge request !2185
 2015-12-23 12:07:37 +00: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
Dmitriy Zaporozhets a84ecf0e2e Fix close/reopen buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-23 12:29:50 +01:00
Sytse Sijbrandij 1607fba755 Merge branch 'meta-example' into 'master' 
Link to the gitlab-ci.yml file of GitLab itself.

I'm hunting for this link from time to time in customer demo's so I think it is useful to add.

/cc @ayufan 

See merge request !1993
 2015-12-23 11:22:46 +00:00
Dmitriy Zaporozhets 7a519bc1e2 Merge branch 'master' into new-buttons 2015-12-23 12:16:37 +01:00
Dmitriy Zaporozhets 2803b6e84e Merge branch 'rs-update-sass-rails' into 'master' 
Bump sass-rails to ~> 5.0.0

Addressing gitlab-org/gitlab-ce#2857

See merge request !2184
 2015-12-23 11:06:30 +00:00
Dmitriy Zaporozhets 37120872e6 Merge branch 'improve_emoji_picker' into 'master' 
Improve emoji picker

This request uses an emoji image sprite to show big set of emojis. The sprite has been made based one gemojione gem images. The categories are retrieved from https://github.com/jonathanwiesel/gemojione/blob/master/config/index.json as well.

Some categories are pretty poor, it can be extended in the future.

It's a first step on the way to improve picker.

The first implementation was using https://github.com/iamcal/emoji-data project, but there was huge incompatibility with gemojione emojis set and I had to drop that solution.

![Screenshot_2015-12-22_23.26.27](/uploads/7d323eb0586204ac92915b41233b97ec/Screenshot_2015-12-22_23.26.27.png)


See merge request !2172
 2015-12-23 11:01:49 +00:00
Grzegorz Bizon 3e6950481a Use method that creates runners registration token 
`runners_registration_token` now creates a new token if it is blank.
 2015-12-23 11:45:17 +01:00
Grzegorz Bizon e68ae9c6af Merge branch 'fix/ci-lint' into 'master' 
Make CI Lint form synchronous

This removes `remote: true` from CI Lint form, making it synchronous
form. This also removes some complexity related to displaying lint
messages.

View also has been updated, removed deprecated Bootstrap 2 tags.
Improved design.

See merge request !2171
 2015-12-23 10:43:32 +00:00
Grzegorz Bizon 37731ba1a1 Add method that persist ensured token in TokenAuthenticatable 2015-12-23 10:47:18 +01:00
Grzegorz Bizon 76f7e80455 Fix method that ensures authentication token 
Until now, `ensure_#{token_filed_name}` method didn't persist new token in database.

This closes #4235.
 2015-12-23 09:37:01 +01:00
Robert Speicher 5ad192ced2 Fix paths for jquery-ui assets 2015-12-22 17:14:01 -05:00
Robert Speicher 66aaaf1fc1 Bump sass-rails to ~> 5.0.0 2015-12-22 17:04:41 -05:00
Andriy Dyadyura f30f518f97 buttons colors update 2015-12-22 22:33:46 +01:00
Valery Sizov 44d8714f38 improved emoji picker style 2015-12-22 23:27:05 +02:00
Robert Speicher 26fa1524f7 Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0 2015-12-22 16:19:02 -05:00
Valery Sizov a56d357be0 TYPO in the comment 2015-12-22 23:12:23 +02:00
Valery Sizov 0d52a694bf customize niceScroll 2015-12-22 23:12:23 +02:00
Valery Sizov bfe905b3ae add some spinach 2015-12-22 23:12:23 +02:00
Valery Sizov 0ae0881250 fix specs 2015-12-22 23:12:23 +02:00
Valery SizovandValery Sizov e5eb700d5e emoji picker: minor fixes 2015-12-22 23:12:23 +02:00
Valery SizovandValery Sizov dfd76c33d9 emoji css refactoring 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
Andriy Dyadyura f4dabf9795 new buttons issue 2015-12-22 21:37:11 +01:00
Andriy Dyadyura a72b71abcc new buttons issue 2015-12-22 21:29:31 +01:00
Andriy Dyadyura a793590d43 new buttons 2015-12-22 21:22:37 +01:00
Stan Hu 3b61dc47ec Merge branch 'fix_leave_project_display' into 'master' 
Fix and test leave project display

The 'Leave this project' display on project page was broken. It was calling the method incorrectly, which returned `nil` and displayed nothing. 

This fixes the display and also adds 2 different tests for it.

cc/ @jvanbaarsen @stanhu Please review and merge if you think it looks good. Thank you!

See merge request !2166
 2015-12-22 19:30:32 +00:00
Stan Hu 301a30e0ea Add project permissions to all project API endpoints 
This standardizes all the project API formats. Also needed to support Huboard.
 2015-12-22 10:58:23 -08:00
Dmitriy Zaporozhets 1cf45407d3 Merge branch 'new-group-page' into 'master' 
New group page

Implementing from https://gitlab.com/gitlab-org/gitlab-ce/issues/3480#note_2722988

cc @skyruler 

For https://gitlab.com/gitlab-org/gitlab-ce/issues/3480

See merge request !2174
 2015-12-22 16:25:25 +00:00
Jacob Schatz d0fc2fe288 border bottom for last comment fixes double line issue 2015-12-22 11:11:02 -05:00
Douwe Maan 2309f339c6 Merge branch 'hotfix/sidekiq-cron-config' into 'master' 
Hotfix for sidekiq-cron being loaded from Settingslogic with defaults

This fixes a regression with "Stack level too deep" from master.

See merge request !2173
 2015-12-22 15:47:50 +00:00
Dmitriy Zaporozhets 8516b20571 New UI for group page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-22 16:37:29 +01:00