home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,205 Commits 48 Branches 340 Tags
cd5cbc0fd55a494247689cbfa5c9a3ef8bc8914e
Commit Graph
25205 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Achilleas Pipinellis cd5cbc0fd5 First draft on GitLab intro docs 
[ci skip]
 2016-03-15 15:57:30 +02:00
Dmitriy Zaporozhets 9403142083 Merge branch 'filter-bug-fix' into 'master' 
Fix bug with JS error from dropdowns in filter area

Fixes:

![consoleerror](/uploads/0fa19a943050baac855c9e6f896ea941/consoleerror.png)

This error is not a logged issue yet.

Error when turbolinks fetches a new page, `setup()` was not run. 

Signed-off-by: Jacob Schatz jschatz@gitlab.com

cc @iamphill @alfredo1 

See merge request !3216
 2016-03-15 09:41:29 +00:00
Dmitriy Zaporozhets 19ecfb5c85 Merge branch 'group-projects-page' into 'master' 
Redesign project tabs on group page

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


Final step to fix #13480 

See merge request !3209
 2016-03-15 08:59:41 +00:00
Douwe Maan a60e09d313 Merge branch 'rs-issue-14220' into 'master' 
Be more intelligent about sanitizing links with unsafe protocols

This prevents false matches on relative links like
`[database](database.md)`.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14220

See merge request !3210
 2016-03-15 08:29:04 +00:00
Jacob Schatz 4fc2dcc4f4 Fix bug with JS error from dropdowns in filter area 2016-03-14 23:23:30 -04:00
Robert Speicher c4b35a6230 Merge branch 'fix-commit-status-rendering' into 'master' 
Cleanup Ci::Commit, Ci::Build and CommitStatus views

This MR tries to do first sweep of cleanups to Ci::Commit and
Ci::Build objects removing all view-related functions and fixing the
API from other side.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/6046

See merge request !2760
 2016-03-15 00:51:43 +00:00
Robert Speicher c1d7e5ac18 Merge branch 'bundle-audit-ignore-redcloth' into 'master' 
Remove allowed to fail by ignoring RedCloth

Having `Allowed to fail` jobs will only make sure we'll miss something
when it should fail, so I excluded a known issue which has been an
issue a long time now.

Now when this build is not green we know we should look at it and pay
attention.

See merge request !3215
 2016-03-15 00:39:33 +00:00
Douwe Maan 2612451bc0 Merge branch 'update-gitlab-git-9.0.3' into 'master' 
Bump gitlab_git to 9.0.3



See merge request !3213
 2016-03-15 00:12:36 +00:00
Zeger-Jan van de Weg 5960e99549 Remove allowed to fail by ignoring RedCloth 2016-03-15 00:36:11 +01:00
Stan Hu d0d7dfb2f5 Bump gitlab_git to 9.0.3 2016-03-14 15:41:36 -07:00
Robert Speicher 41de7b345b Be more intelligent about sanitizing links with unsafe protocols 
This prevents false matches on relative links like
`[database](database.md)`.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14220
 2016-03-14 18:05:01 -04:00
Jacob Schatz e1e79e7e17 Merge branch 'zero-dropdown-id' into 'master' 
Fixes issue with unassigned not working in dropdown

Also allowed issues to be bulk unassigned

See merge request !3211
 2016-03-14 22:03:20 +00:00
Stan Hu 449e1d4f04 Merge branch 'upgrade-capybara' into 'master' 
Bump Capybara gem to 2.6.2

2.6.2 has new selectors, such as `have_current_path`, that may be useful.


See merge request !3200
 2016-03-14 21:35:34 +00:00
Douwe Maan ca3fc2296f Merge branch 'gitlab-ci-yaml-updates' into 'master' 
New CI YAML features

This introduces a couple of small `.gitlab-ci.yml` features:

1. Documentation for: Allow to use YAML anchors when parsing the `.gitlab-ci.yml`: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2958
2. Ignore jobs that start with `.`
3. Allow to pass name of created artifacts archive in `.gitlab-ci.yml`
4. Allow to define on which builds the current one depends on

These are really small changes so it makes not sense to create a separate merge requests for them.

@axil Could you review the documentation part?

The implementation on GitLab Runner side: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/113.

Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/13755 https://gitlab.com/gitlab-org/gitlab-ce/issues/14211 https://gitlab.com/gitlab-org/gitlab-ce/issues/3423

cc @grzesiek @axil @DouweM 


See merge request !3182
 2016-03-14 20:06:50 +00:00
Phil Hughes cef1f4f2d9 Fixes issue with unassigned not working in dropdown 
Also allowed issues to be bulk unassigned
 2016-03-14 20:04:05 +00:00
Douwe Maan 29b186e49d Merge branch 'improve-award-emoji-spec' into 'master' 
Improve award emoji test reliability and eliminate sleeps

Closes #14129

See merge request !3195
 2016-03-14 19:57:25 +00:00
Jacob Schatz 3211d1cb76 Merge branch 'nav-over-content-mobile' into 'master' 
Left sidebar overlaps the content on mobile devices

On mobile, the navigation sidebar will always revert to being hidden. When clicking the toggle, it will then go over the top of the content - rather than push the content.

See merge request !3087
 2016-03-14 19:05:34 +00:00
Dmitriy Zaporozhets 6c791f7da7 Redesign project tabs on group page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-14 18:31:14 +01:00
Robert Speicher b782e7c973 Merge branch 'rs-note-active-spec' into 'master' 
Add unit specs for `Note#active?`

See merge request !3133
 2016-03-14 12:53:15 -04: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
Stan Hu 3cc040e110 Bump Capybara gem to 2.6.2 2016-03-14 09:10:36 -07:00
Phil Hughes 09d3cdfd9e Changed project home icon 
Closes #14196
 2016-03-14 16:03:17 +00:00
Robert Speicher d213758a9a Merge branch 'rs-prepare-8-6' into 'master' 
Prepare docs for 8.6 RC1

[ci skip]

See merge request !3173
 2016-03-14 15:57:20 +00:00
Robert Speicher 1421fa962e Merge branch 'rs-snippet-expires-api' into 'master' 
Don't remove `ProjectSnippet#expires_at` from API

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103

This partially reverts commit 836d593033.

See merge request !3144
 2016-03-14 15:55:05 +00:00
Robert Speicher d26bd026d9 Update GITLAB_SHELL_VERSION to match EE 
[ci skip]
 2016-03-14 11:53:42 -04:00
Robert Speicher 9c3643046b Merge branch 'issue-filter-tests' into 'master' 
Fixed tests for MR & issue filters

See merge request !3203
 2016-03-14 15:47:27 +00:00
Robert Speicher a6cef2370b Merge branch 'remove-sleeps-from-network-graph-spec' into 'master' 
Remove sleeps from network graph feature spec

Also removed a double negative in the step description

See merge request !3199
 2016-03-14 15:14:49 +00:00
Phil Hughes 35aca2d5fd Fixed tests for MR & issue filters 2016-03-14 13:49:53 +00:00
Phil Hughes a965b03369 Removed call to setup from breakpoint size method 2016-03-14 13:02:40 +00:00
Kamil Trzcinski 16592e2b45 Fix review comments 
- Remove unused Gitlab::Application.routes.url_helpers from Ci::Build
- Remove too much logic from a view, use Ci::Commit.matrix_builds
- Use ci_status_with_icon
- Don't describe symbols
 2016-03-14 13:33:26 +01:00
Kamil Trzcinski f32e28f6fa Fix commit_spec: invalid validation 2016-03-14 13:20:35 +01:00
Kamil Trzcinski 0672258915 Cleanup CiCommit and CiBuild 
- Remove all view related methods from Ci::Build and CommitStatus
- Remove unused Ci::Commit and Ci::Build methods
- Use polymorphism to render different types of CommitStatus
 2016-03-14 13:20:35 +01:00
Phil Hughes 1a5992b5eb Changed breakpoint size 
Changed breakpoint class into singleton
 2016-03-14 11:51:07 +00:00
Phil Hughes 23b0eeca28 removed un-used function call 2016-03-14 11:39:56 +00:00
Phil Hughes f0f6723fe0 Created bootstrap breakpoint class 
This class checks the current bootstrap breakpoint
 2016-03-14 11:39:56 +00:00
Phil Hughes ce9bbce78a changed jquery document ready 2016-03-14 11:39:56 +00:00
Phil Hughes b155d54941 Removed deprecated bootstrap variables 2016-03-14 11:39:56 +00:00
Phil Hughes 9d6e0c5071 Left sidebar overlaps the content on mobile devices 2016-03-14 11:39:56 +00:00
Dmitriy Zaporozhets 37ba5a12b5 Merge branch 'improve-issues-filter-all-spec' into 'master' 
Use Capybara find methods and remove sleeps in feature specs in "All Issues" filter

Fixes sporadic build failures (e.g. https://gitlab.com/gitlab-org/gitlab-ce/builds/856233)

See merge request !3198
 2016-03-14 11:30:47 +00:00
Marin Jankovski 90c10f4dab Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-03-14 11:40:17 +01:00
Achilleas Pipinellis 7ebb932070 Add yaml definition to codeblock 
[ci skip]
 2016-03-14 10:14:32 +02:00
Stan Hu f0c73a5bdb Remove sleeps from network graph feature spec 2016-03-13 22:09:42 -07:00
Stan Hu ab0af56201 Use Capybara find methods and remove sleeps in feature specs in "All Issues" filter 2016-03-13 17:22:10 -07:00
Stan Hu a181722ae4 Improve award emoji test reliability and eliminate sleeps 
Closes #14129
 2016-03-13 13:39:28 -07:00
Douwe Maan c07ef544d1 Merge branch 'upcoming' into 'master' 
Implements upcoming filter in milstones

![Imgur](http://i.imgur.com/Oc2LZrF.png)

@DouweM @JobV I think this is what you wanted :) Lemme know if it there is something that need changing
Had alot of fun doing it!

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14102

See merge request !3148
 2016-03-13 18:18:15 +00:00
Douwe Maan 8e7661c218 Merge branch 'redirect-host-check' into 'master' 
Redirect host check

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

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13956

See merge request !1945
 2016-03-13 13:18:24 +00:00
Zeger-Jan van de Weg 5352ec2e21 Fix denting and spec 2016-03-13 13:44:31 +01:00
tiagonbotelho d3b7633da4 fixes small issues 2016-03-13 12:19:27 +00:00
Zeger-Jan van de Weg dfb96ed84b ContinueToParams -> ContinueParams 2016-03-13 13:13:19 +01:00