home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
880 Commits
Author SHA1 Message Date
Phil HughesandJacob Schatz 6416f8eab1 Updated based on Ruby feedback 2016-04-12 13:10:43 -04:00
Phil HughesandJacob Schatz f870857ddd Updated tests 2016-04-12 13:10:43 -04:00
Phil HughesandJacob Schatz dca50ac1d4 Project dropdown in header uses new dropdown 2016-04-12 13:10:43 -04:00
Jacob Schatz f2b7cd4435 Revert "Merge branch 'new-navigation-prototype' into 'master'" 
This reverts merge request !3494
 2016-04-07 21:20:16 +00:00
Douglas Barbosa Alexandre bb5bc90ab0 Update number of Todos in the sidebar when it's marked as "Done" 2016-04-07 12:35:25 -03:00
Rémy Coutable 8eae7b1088 Merge branch 'feature/expose-builds-badge' into 'master' 
Expose badges

This MR exposes badge somewhere in visible place.

![expose_badges](/uploads/d2e290d3013d1ef2b1bdeebbbe2c5d8b/expose_badges.png)

Closes #13801

See merge request !3326
 2016-04-07 08:40:15 +00:00
Robert Speicher 730625f022 Merge branch 'patch/fix-markdown-preview-wikis' into 'master' 
Wiki preview URL converting problem [via Markdown]

Current implementation when rendering the preview, thinks relative links are for project repository files.

We are creating a new preview route that will define correct context data to render for wikis instead.

Fixes #2380, #1184

See merge request !3461
 2016-04-07 00:17:21 +00:00
Alfredo Sumaran bfcee4a51d Merge branch 'master' into issue_14952 2016-04-06 16:35:04 -05:00
Alfredo Sumaran 946b4519c9 Use .new_record? instead 2016-04-06 16:31:34 -05:00
Alfredo Sumaran ee87d15cf4 Change approach, do not use timeouts 2016-04-06 13:23:18 -05:00
Grzegorz Bizon a3a93ba4b0 Expose project badges in project settings menu 2016-04-06 19:56:34 +02:00
Alfredo Sumaran d2afeb8dde Do not add location badge when creating a group or project 2016-04-05 17:29:40 -05:00
Dmitriy Zaporozhets 31b27adeb8 Fix milestones tab active state and tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-02 11:26:46 +02:00
Dmitriy Zaporozhets 847940516b Fix some active tab tests that are broken because of 2 level sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 22:35:49 +02:00
Dmitriy Zaporozhets 4a8bd9faaf Some tweaks to new sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 20:34:42 +02:00
Dmitriy Zaporozhets de6360f904 Improve styling for new complex sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 19:51:18 +02:00
Dmitriy Zaporozhets 03f2dd90ec Hide sidebar completely when collapsed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 19:32:39 +02:00
Dmitriy Zaporozhets dbc96f05d0 Refactor left navigation sidebar to use 2 levels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 18:24:03 +02:00
Dmitriy Zaporozhets 18dd525d0f Concept of 2 level navigation sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-04-01 16:58:28 +02:00
Gabriel Mazetto b69f8a62b2 Add specific markdown_preview route for Wikis 2016-03-30 15:04:58 -03:00
Alfredo Sumaran 9d51f86694 Makes autocomplete dropdown look the same as others 2016-03-25 01:55:46 -05:00
Alfredo Sumaran 0dff7b4444 Merge branch 'master' into issue_3400_port 
# Conflicts:
#	app/assets/javascripts/gl_dropdown.js.coffee
 2016-03-23 18:49:49 -05:00
Alfredo Sumaran 44817726fe Fixes empty menu when typing on search input for the very first time 2016-03-23 14:12:33 -05:00
Phil Hughes b4f97b93a9 Fixes issue with signin button overflowing on mobile 
Closes #14477
 2016-03-22 13:56:07 +00:00
Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 
# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb
 2016-03-21 23:22:21 +01:00
Alfredo Sumaran a477d604f6 Add ability to clear location badge 2016-03-21 16:00:53 -05:00
Jacob Schatz 16b44f7184 Merge branch 'project-icon' into 'master' 
Changing project icon

Closes #14196

See merge request !3268
 2016-03-21 19:33:57 +00:00
Alfredo Sumaran fb0d20c553 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into issue_3400_port 2016-03-21 12:09:52 -05:00
Phil Hughes debc882cad Updated other views with new project icon 2016-03-21 10:08:00 +00:00
Douwe Maan 8db1292139 Tweaks, refactoring, and specs 2016-03-20 21:04:07 +01:00
Douwe Maan 2eb19ea3ea Merge branch 'master' into issue_12658 2016-03-20 14:57:25 +01:00
Douwe Maan a8aa59e96e Inline mailer CSS using premailer. 
# Conflicts:
#	Gemfile.lock
 2016-03-19 20:04:10 +01:00
Alfredo SumaranandJacob Schatz 53df7263b7 Use new dropdown class for search suggestions 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz ec0dfff204 Add icons 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 82e3c1f257 Change hidden input id to avoid duplicated IDs 
The TODOs dashboard already had a #project_id input and it was causing a spec to fail
 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz 6a7f4a0767 Apply styling and tweaks to autocomplete dropdown 2016-03-18 14:06:51 -04:00
Alfredo SumaranandJacob Schatz c9e202c1d7 Working version of autocomplete with categorized results 2016-03-18 14:06:51 -04:00
Robert Speicher aee6dbc6de Merge branch 'rs-issue-14259' into 'master' 
Prevent a 500 when a repository's root_ref is nil

Closes #14259

See merge request !3278
 2016-03-18 16:24:51 +00:00
Douglas Barbosa Alexandre 1029f4101b Fix issues count on project view 2016-03-17 20:55:59 -03:00
Robert Speicher 6048910aee Prevent a 500 when a repository's root_ref is nil 
Closes #14259
 2016-03-17 13:46:17 -04:00
Felipe Artur 44c127447b Merge 4009-external-users into issue_12658 2016-03-16 20:16:42 -03:00
Rémy Coutable 54ec7e9599 Improving the original label-subscribing implementation 
1. Make the "subscribed" text in Issuable sidebar reflect the labels
   subscription status

2. Current user mut be logged-in to toggle issue/MR/label subscription
 2016-03-15 18:22:02 +01:00
Robert Speicher 90e91e28e4 Merge branch 'application-settings' into 'master' 
Applications tab on profile settings

Closes #13855

See merge request !3031
 2016-03-15 14:33:14 +00:00
Jacob Schatz 961bc41c38 Merge branch 'updated-project-home-icon' into 'master' 
Changed project home icon

Closes #14196

![Screen_Shot_2016-03-14_at_16.01.48](/uploads/0039c0c3afe0bf560368d2b910e2a93f/Screen_Shot_2016-03-14_at_16.01.48.png)

See merge request !3207
 2016-03-14 16:44:31 +00:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master' 
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

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

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
 2016-03-14 16:38:52 +00:00
Phil Hughes 09d3cdfd9e Changed project home icon 
Closes #14196
 2016-03-14 16:03:17 +00:00
Robert Speicher 8f21e2ae40 Let oauth/applications#index handle the profiles#applications route 
Previously we were doing all of kinds of code gymnastics and flash abuse
in order to work with a Doorkeeper controller but have it _appear_ at
the `/profile/applications` path. Fortunately we can just tell Rails to
use a different controller to handle that route, and we get the best of
both worlds.
 2016-03-13 16:51:09 -04:00
Robert Speicher ee14ac68a5 Merge branch 'group-activity-separate-tab' into 'master' 
Move group activity feed to separate page for consistency with dashboard
and project pages

Fixes #14161. Part of #13480 

See merge request !3157
 2016-03-11 19:58:10 +00:00
Dmitriy Zaporozhets 746ac56b6f Add functionality to setup share of project with group via project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-11 18:37:46 +01:00
ashleys 4cd9a5208c web hooks to webhooks 2016-03-10 14:48:29 -05:00