Commit Graph
25692 Commits
Author SHA1 Message Date
Jacob Vosmaer aae577f921 Add test for gitlab_shell.upload_pack config setting 2016-03-24 17:34:56 +01:00
Jacob Vosmaer 1433068ad9 Remove useles only: 2016-03-24 16:28:18 +01:00
Jacob Vosmaer 0f8fe93c26 Whitespace, remove unused method 2016-03-24 16:21:19 +01:00
Jacob Vosmaer 31bc876b7b Test both GET and POST for git-upload-pack 2016-03-24 16:14:09 +01:00
Jacob Vosmaer 8f3e86d72c Keep Grack::Auth in the routes for LFS only 2016-03-24 14:53:20 +01:00
Jacob Vosmaer 55f5a68f09 Get Grack::Auth tests to pass 2016-03-23 18:34:16 +01:00
Jacob Vosmaer 19a5e7c95e Test Grack::Auth via a request spec 2016-03-23 14:09:52 +01:00
Rémy Coutable 7124e5a44c Merge branch 'fix-build-dependencies' into 'master'
Fix build dependencies, when the dependency is a string

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

See merge request !3344
2016-03-23 11:58:12 +00:00
Kamil TrzcinskiandRémy Coutable 68c0dc1fbe Update CHANGELOG 2016-03-23 12:55:23 +01:00
Kamil TrzcinskiandRémy Coutable 858bf727bc Test dependencies defined as symbols 2016-03-23 12:55:23 +01:00
Kamil TrzcinskiandRémy Coutable 8fac12c590 Fix build dependencies, when the dependency is a string 2016-03-23 12:55:23 +01:00
Rémy Coutable b6806d0cbc Merge branch 'fix/14505' into 'master'
Fix an issue causing the Dashboard/Milestones page to be blank

Fixes #14505 and #14514.

See merge request !3348
2016-03-23 11:40:10 +00:00
Rémy Coutable 260b9415df Add CHANGELOG item 2016-03-23 12:02:15 +01:00
Rémy Coutable ce44e5a787 Add missing Dashboard::LabelsController 2016-03-23 12:02:15 +01:00
Rémy Coutable e989d12b07 Use respond_to instead of a conditional to paginate milestones 2016-03-23 12:02:15 +01:00
Rémy Coutable 7dc16346bb Fix an issue causing the Dashboard/Milestones page to be blank 2016-03-23 12:02:15 +01:00
Douwe Maan 703f7c5d57 Merge branch 'fix-sorting-by-votes-on-groups-page' into 'master'
Fix sorting issues/mrs by votes on the groups page

Closes #14394 

The `non_archived` scope applied here https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/controllers/concerns/issues_action.rb#L5 overrides the previous `ORDER BY` applied inside the IssuesFinder, with the default scope of the Project model, resulting in SQL errors.

```ruby
Issue.reorder(created_at: :desc).joins(:project).to_sql
=> "SELECT issues.* 
    FROM issues INNER JOIN projects ON projects.id = issues.project_id
    ORDER BY issues.created_at DESC"

Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived).to_sql
=> "SELECT issues.* 
    FROM issues INNER JOIN projects ON projects.id = issues.project_id 
    WHERE projects.archived = 'f'
    ORDER BY projects.id DESC"

Issue.reorder(created_at: :desc).joins(:project).merge(Project.non_archived.only(:where)).to_sql
=> "SELECT issues.* 
    FROM issues INNER JOIN projects ON projects.id = issues.project_id 
    WHERE projects.archived = 'f'
    ORDER BY issues.created_at DESC"
```

/cc @yorickpeterse 

See merge request !3333
2016-03-23 10:35:54 +00:00
Douwe Maan 3b39ce3252 Merge branch 'notifications-for-subscribers-confidential-issue-labels' into 'master'
Restrict notifications for confidential issues

Closes #14468 

/cc @rymai 

See merge request !3334
2016-03-23 10:34:20 +00:00
Douwe Maan 0c0f925339 Merge branch 'move-issue-section-should-not-be-displayed-in-the-new-issue-form-14489' into 'master'
Moving of issuables only when the record already exists

Closes #14489

See merge request !3340
2016-03-23 10:29:26 +00:00
Grzegorz Bizon 915bfedfa7 Do not allow to move issue if it has not been persisted 2016-03-23 09:41:39 +01:00
Zeger-Jan van de WegandGrzegorz Bizon d967b122a9 Moving of issuables only when the record already exists 2016-03-23 09:40:53 +01:00
Robert Speicher 672c8fd097 Merge branch 'scss-lint-enable' into 'master'
Fixes last remaining lints and enables scss-lint test for GitLab CI.

With this, builds will now fail if they break the SCSS style guide (at least, the parts enabled by the linter).

Discussed in #14299.

See merge request !3353
2016-03-23 04:38:16 +00:00
connorshea edac38c439 Fixes last remaining lints and enables scss-lint test for GitLab CI.
With this, builds will now fail if they break the SCSS style guide (at
least, the parts enabled by the linter).

Discussed in #14299.
2016-03-22 15:01:31 -06:00
Robert Speicher 57dd206f12 Merge branch 'css-selector-format' into 'master'
Disabled SelectorFormat rule for SCSS Lint in order to get the Rake
task passing sooner.

SelectorFormat enforces that CSS classes and IDs use lowercase
hyphenated style, `like-this`, but a not-insignificant amount of
selectors in the codebase are `like_this`.

Fixing the selectors that break this rule would require changing HTML
as well, and potentially break JavaScript hooks, among other things. So
I decided to disable this rule for the time being, hopefully making it
easier to fix all the remaining warnings SCSS Lint is giving by removing
the most problematic rule.

Discussed in #14299.

See merge request !3309
2016-03-22 21:00:48 +00:00
Jacob Schatz 62ffdbeb2d Merge branch 'merge-request-sidebar' into 'master'
Fixed bug where participants would not work correctly on merge requests

Also fixed alignment bug with can't merge badge

Closes #14478, #14494

See merge request !3329
2016-03-22 20:37:31 +00:00
Jacob Schatz 5a349efcab Merge branch 'header-mobile-overflow' into 'master'
Fixes issue with signin button overflowing on mobile

Closes #14477

![Screen_Shot_2016-03-22_at_13.52.51](/uploads/7c9b2c38be7d497c690a7d17ae0ca76d/Screen_Shot_2016-03-22_at_13.52.51.png)

![Screen_Shot_2016-03-22_at_13.52.43](/uploads/8b2432aeb4afec455286fced11c5490c/Screen_Shot_2016-03-22_at_13.52.43.png)

See merge request !3342
2016-03-22 20:33:07 +00:00
Jacob Schatz 16f05230a6 Merge branch 'auto-collapse-nav' into 'master'
Auto collapses the navigation when resizing

Closes #14475 

![auto-collapse](/uploads/332c6261acb6bc30d7d30cbdfafe92eb/auto-collapse.gif)

See merge request !3343
2016-03-22 20:31:15 +00:00
Jacob Schatz fb1a7553c7 Merge branch 'issue_13885' into 'master'
Display nav controls on mobile

Set inputs inside .nav-controls to full-width on viewports below 600px

Fixes #13885

**Affected pages**


/dashboard/groups

/admin/builds

/dashboard/projects

/dashboard/issues

/dashboard/merge_requests

/dashboard/milestones

/dashboard/todos

/explore

/groups/{group-name}/issues

/groups/{group-name}

/groups/{group-name}/milestones

/{group-name}/{project-name}/builds

/{group-name}/{project-name}/forks

/{group-name}/{project-name}/issues

/{group-name}/{project-name}/labels

/{group-name}/{project-name}/merge_requests

/{group-name}/{project-name}/milestones

/{group-name}/{project-name}/wikis/home

/{group-name}/{project-name}/wikis/pages


Some Screenshots

**Groups**

![Screen_Shot_2016-03-15_at_2.22.23_PM](/uploads/b55348676693cc3ff67cddc4528f7f6c/Screen_Shot_2016-03-15_at_2.22.23_PM.png)


**Admin > Builds**

![admin-builds](/uploads/2e84119660f4895a1530883412c4b728/admin-builds.png)


**TODOs**

![todos](/uploads/84344c43011e22f902701038932d3eaa/todos.png)

**Dashboard > Projects**

![dashboards-projects](/uploads/f508d9107598038798aa10485d3d5cfe/dashboards-projects.png)


**Project Issues**

![issues](/uploads/d6c69a8f81ee07da95b2a3b99b81cf51/issues.png)


**Project Merge Requests**

![merge_requests](/uploads/b3c1a537f28931bd38077c36627a0d7a/merge_requests.png)


See merge request !3214
2016-03-22 19:49:46 +00:00
Jacob Schatz 5b2ce9adb4 Merge branch 'label-dropdown-errors' into 'master'
Shows error messages when trying to create label in dropdown menu

Closes #14495

![Screen_Shot_2016-03-22_at_14.46.10](/uploads/cdcaa51f4d41237f8027efbd0f894bcd/Screen_Shot_2016-03-22_at_14.46.10.png)

See merge request !3345
2016-03-22 19:45:25 +00:00
Jacob Schatz 4896d49a25 Merge branch 'fix-milestone-assign' into 'master'
Fixes issue with assign milestone not loading milestone list

cc. @jschatz1 

See merge request !3346
2016-03-22 19:30:59 +00:00
Drew Blessing 6500ee143d Merge branch 'grafana_documentation' into 'master'
Grafana installation and configuration documentation

Adding documentation for installing and configuring Grafana. This also includes providing dashboards users can import.

Fixes gitlab-org/omnibus-gitlab#1008

cc/ @axil

See merge request !3015
2016-03-22 18:36:28 +00:00
Drew Blessing 1d99c8fe60 Grafana installation and configuration documentation. [ci skip] 2016-03-22 13:34:05 -05:00
Douglas Barbosa Alexandre 8ca5b33175 Fix issues count on labels page 2016-03-22 15:29:57 -03:00
Douglas Barbosa Alexandre 0a8c9f7212 Restrict notifications for confidential issues 2016-03-22 15:29:57 -03:00
Robert Speicher 37093af6d6 Merge branch 'drop_db_before_restore' into 'master'
Reload the schema before restoring a database backup

If a user tries to downgrade and restore after a failed upgrade,
the database may still contain newer tables. Reload the older
schema before restoring the database to avoid future upgrade
problems. Also, add a rake task to help users add migration
versions to the database so it's easier to recover from these
errors if they do occur. Fixes #13419

See merge request !2807
2016-03-22 16:24:55 +00:00
Phil Hughes 33489f29f3 Fixes issue with assign milestone not loading milestone list 2016-03-22 16:00:47 +00:00
Douwe Maan 18c049886e Merge branch 'delete-button-on-edit-issue-has-no-confirmation-14474' into 'master'
User has to confirm deletion of issuables

Closes #14474

See merge request !3341
2016-03-22 15:11:51 +00:00
Phil Hughes 07da865113 Shows error messages when trying to create label in dropdown menu
Closes #14495
2016-03-22 14:56:00 +00:00
Rémy Coutable f27210d54b Update CHANGELOG
[ci skip]
2016-03-22 15:43:53 +01:00
Phil Hughes 21f5524926 Auto collapses the navigation when resizing
Closes #14475
2016-03-22 14:08:27 +00:00
Phil Hughes b4f97b93a9 Fixes issue with signin button overflowing on mobile
Closes #14477
2016-03-22 13:56:07 +00:00
Zeger-Jan van de Weg 73a8088e2c User has to confirm deletion of issuables 2016-03-22 14:06:03 +01:00
Achilleas Pipinellis 8df6c3b960 Merge branch 'doc_group_visibility' into 'master'
Add docs on group visibility

Accompanying https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3323

See merge request !3338
2016-03-22 11:35:20 +00:00
Achilleas Pipinellis d0898fa243 Merge branch 'gitlab_intro_docs' into 'master'
GitLab intro docs

Related to https://gitlab.com/gitlab-org/marketing_monthly_release/issues/1

---

Need refactor:

- Create a new project
- Create a new group
- Create a new issue
- Assign labels to issues
- Use milestones as an overview of your project's tracker
- Fork a project and contribute to it
- Create a new merge request
- Automatically close issues from merge requests (include GitLab.com pattern)
- GitLab CI quick start guide (make it easier to follow)

Moved to https://gitlab.com/gitlab-org/gitlab-ce/issues/8068

See merge request !3225
2016-03-22 11:21:48 +00:00
Achilleas Pipinellis 09cd4351fa Remove redundant word
[ci skip]
2016-03-22 13:11:18 +02:00
Achilleas Pipinellis e53707fc9e Refactor award emoji doc a bit
[ci skip]
2016-03-22 12:59:28 +02:00
Achilleas Pipinellis f4a13f0844 Fix grammar in intro guide 2016-03-22 12:56:52 +02:00
Achilleas Pipinellis 2adc874fc8 Add docs on group visibility
[ci skip]
2016-03-22 12:36:43 +02:00
Achilleas Pipinellis 05ca1096dd Merge Git basics into Start using Git
[ci skip]
2016-03-22 12:01:13 +02:00
Achilleas Pipinellis 1030ebb89f Add award emoji docs
[ci skip]
2016-03-22 11:50:16 +02:00