home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-28 22:16:15 +10:00
Code Issues Packages Projects Releases Wiki Activity
28,431 Commits 48 Branches 340 Tags
f04c5b27f0c19dfab00a6ac2de8b4168b67fe7a0
Commit Graph
936 Commits
Author SHA1 Message Date
Douwe Maan 18ef054bc7 Merge branch '17464-backport-email-syntax-highlighting' into 'master' 
Syntax-highlight diffs in push emails

![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png)

Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151



See merge request !4147
 2016-05-19 21:12:53 +00:00
Douwe Maan bd0cecfdf6 Merge branch 'with-pipeline-view' into 'master' 
Add pipeline view

This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653

cc @DouweM @grzesiek 

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625


See merge request !3703
 2016-05-19 20:42:43 +00:00
Sean McGivern a9977f2b7a Syntax-highlight diffs in push emails 
Based on:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151
 2016-05-17 13:23:17 +01:00
Kamil Trzcinski ecee057795 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-05-13 17:15:09 -05:00
Kamil Trzcinski f4f59d0f13 Merge branch 'docker-registry' into docker-registry-view 2016-05-13 17:15:01 -05:00
Annabel Dunstone 16b1d3a34f Fix mobile dropdown bug 2016-05-13 11:12:49 -05:00
Dmitriy Zaporozhets c37006fa4f Merge branch '17485-broadcast-msg' into 'master' 
Move broadcast msg into content-wrapper

Closes #17485  

<img src="/uploads/ab365f471209c55d2ee876cf558d4032/Screen_Shot_2016-05-12_at_4.21.22_PM.png" width="800px">

See merge request !4132
 2016-05-13 13:04:36 +00:00
Douwe Maan 7fc51d1908 Merge branch 'health-check-route' 
# Conflicts:
#	db/schema.rb
 2016-05-12 16:39:03 -05:00
Annabel Dunstone e4d3e94955 Move broadcast msg into content-wrapper 2016-05-12 16:22:21 -05:00
Connor Shea 51e198fb38 Don't show the Todo count if there aren't any Todos. 
When there are 0 Todos, the Todos icon still had the blue badge with a "0" in it, which made me think I had a new Todo left. This makes it less annoying.

Follow-up on !4077.
 2016-05-10 21:56:40 -06:00
DJ Mountney 160ef66d1b Add health_check access token, and enforce on the health_check endpoint 
Also added a health check page to the admin section for resetting the token.
 2016-05-10 08:46:02 -07:00
Annabel Dunstone 8eb31c40fc Hide navbar on mobile 2016-05-09 18:53:25 -05:00
Kamil Trzcinski fe2137d871 Improve pipelines design 2016-05-10 02:26:13 +03:00
Kamil Trzcinski 7c1acb022a Merge remote-tracking branch 'origin/master' into with-pipeline-view 
# Conflicts:
#	app/views/projects/ci/builds/_build.html.haml
#	app/views/projects/commit/_ci_commit.html.haml
#	app/views/projects/commit/_commit_box.html.haml
 2016-05-09 23:53:02 +03:00
Kamil Trzcinski 6086958002 Rename image to container_registry 2016-05-09 22:34:10 +03:00
Kamil Trzcinski 565a5e36fc Merge branch 'docker-registry' into docker-registry-view 2016-05-09 22:12:34 +03:00
Kamil Trzcinski 5196f8e993 WIP 2016-05-08 22:50:30 +02:00
Dmitriy Zaporozhets dd03cfd136 Make group settings button white instead of gray for better visibility 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-06 21:05:57 +02:00
Dmitriy Zaporozhets ecd7c1d25a Merge branch 'nice-todos-bell' into 'master' 
Add nice new Todo bell

![H5bp___Html5_Boilerplate___GitLab](/uploads/e8725396a5d77a8db09742f977595605/H5bp___Html5_Boilerplate___GitLab.png)

![H5bp___Html5_Boilerplate___GitLab](/uploads/011a21ee1653502c4f78543e28d97b67/H5bp___Html5_Boilerplate___GitLab.png)

![H5bp___Html5_Boilerplate___GitLab](/uploads/0858cb9621463ef6a32237fcb0b4f63d/H5bp___Html5_Boilerplate___GitLab.png)

Fixes: #15671 

See merge request !4077
 2016-05-06 16:37:40 +00:00
Jacob Schatz 510b10583c Add nice new Todo bell 2016-05-06 11:47:43 -04:00
Dmitriy Zaporozhets 64ef2e0834 Move group settings navigation to own partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-06 17:33:32 +02:00
Dmitriy Zaporozhets 5a8b8ba6c7 Fix group settings dropdown for group members and visitors 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-05 16:37:41 +02:00
Dmitriy Zaporozhets 4bef939e27 Remove group rss icon since it depends on context and duplciates on other pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-05 16:31:19 +02:00
Annabel Dunstone 4ed9e5f5be Update font colors, font sizes, caret icon, avatar size 2016-05-04 13:11:38 -05:00
Annabel Dunstone 003b36b45f Fixed layout nav, revert back to badge styles, general enhancements 2016-05-04 11:43:47 -05:00
Kamil Trzcinski 9e619d3813 Use Container Images 2016-05-04 16:28:01 +02:00
Kamil Trzcinski b0ddbaa07c Added docker registry view 2016-05-04 11:31:35 +02:00
Annabel Dunstone f53557a4fa Group navigation design update 2016-05-03 12:36:04 -05:00
Dmitriy Zaporozhets bdda1eedde Fix 404 on group page if user is not member of page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-03 14:30:42 +02:00
Dmitriy Zaporozhets 774af93027 Remove go to dashboard test suite for group page and get rid of AR warning 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-03 13:04:47 +02:00
Dmitriy Zaporozhets d8440b3035 Fix active state for group pages if user not logged in 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-03 12:37:07 +02:00
Dmitriy Zaporozhets 01aed0c848 Dont specify sidebar for group and group settings layouts 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-05-03 12:31:50 +02:00
Dmitriy Zaporozhets df5b73e17d Merge branch 'master' into group-navigation-redesign 2016-05-03 10:45:45 +02:00
Robert Speicher c9bc3d20ef Merge remote-tracking branch 'dev/master' into 'master' 2016-05-02 19:58:54 -04:00
Dmitriy Zaporozhets e9eeeaa0d0 Redesign navigation for group pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-28 15:35:40 +02:00
Dmitriy Zaporozhets 4a3f3bc702 Make layout navigation gray and fluid 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-28 14:23:25 +02:00
Kamil Trzcinski cb90368a69 Merge remote-tracking branch 'origin/master' into with-pipeline-view 2016-04-26 16:36:17 +02:00
Marin Jankovski 2f5394f5d6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-04-26 11:08:56 +02:00
Jacob Schatz d809507e05 Merge branch 'issue_14904' into 'master' 
Add new shortcuts

Closes #14904

- On a project: `i` To navigate to New Issue page.
- On a issuable: `l` To open Label dropdown on a issuable.
- Global: Typing `?` multiple times now toggles the modal.

See merge request !3686
 2016-04-25 19:13:25 +00:00
Douwe Maan d3462e711c Fix issue with impersonation 2016-04-22 23:21:56 +02:00
Phil HughesandRobert Speicher 50ed43e490 Improved confirmation UX 
Closes #4228
 2016-04-21 20:20:09 -04:00
Alfredo Sumaran 3b39214f29 Merge remote-tracking branch 'origin/master' into issue_14904 2016-04-21 12:47:32 -05:00
Dmitriy Zaporozhets f4859b93a5 Merge branch 'top-navigation-concept' into 'master' 
Implement top navigation for profile area

Main idea is to keep left sidebar static so user is not confused by
changing context. Instead we put changing navigation with changing
content in one main block. I used profile area as a simplest way to 
implement and test this concept. Your feedback is welcome in comments

For https://gitlab.com/gitlab-org/gitlab-ce/issues/14354#note_4878536


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

See merge request !3824
 2016-04-21 11:48:28 +00:00
Dmitriy Zaporozhets f93b0f3ea2 Layout navigation should respect layout width settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-20 18:30:53 +02:00
Dmitriy Zaporozhets 52268d1d9a Fix tests and remove counters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-19 21:11:33 +02:00
Dmitriy Zaporozhets 324e57693b Implement top navigation concept for profile area 
Main idea is to keep left sidebar static so user is not confused by
changing context. Instead we put changing navigation with changing
content in one main block

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-19 20:05:30 +02:00
Felipe Artur 62f6601c59 Show project members only for members 2016-04-18 17:53:34 -03:00
Alfredo Sumaran eaedc49ea3 Use proper method 2016-04-18 15:03:36 -05:00
Alfredo Sumaran ef818d0964 Fix specs 2016-04-18 15:03:36 -05:00
Alfredo Sumaran eb45c48d20 Set i as a shortcut for creating a new issue 2016-04-18 15:03:36 -05:00