home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,882 Commits 48 Branches 340 Tags
c19195f4858cee08918953e838ed2ae423ac574b
Commit Graph
25882 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher c19195f485 Merge branch 'gitlab-shell-2.7' into 'master' 
Updated gitlab-shell to 2.7

This is done to include the changes introduced in
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.

See merge request !3437
 2016-03-29 15:56:17 +00:00
Yorick Peterse 67be43e6a3 Updated gitlab-shell to 2.7 
This is done to include the changes introduced in
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.
 2016-03-29 15:46:47 +02:00
Dmitriy Zaporozhets 54957d6932 Merge branch 'rs-fix-migrations' into 'master' 
Use raw SQL instead of Rails models in migrations where appropriate

Closes #14694.

See merge request !3429
 2016-03-29 10:58:12 +00:00
Rémy Coutable f4238634d3 Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master' 
Fix order of steps to prevent PostgreSQL errors when running migration

Supersedes https://github.com/gitlabhq/gitlabhq/pull/10100.

/cc @stanhu @rodrigomanhaes

See merge request !3355
 2016-03-29 10:36:34 +00:00
Rémy Coutable 00726e4df9 Merge branch 'fix/nomethod-error-on-ci' into 'master' 
Fix error when visiting CI root path

Closes #14528, closes #14687

See merge request !3377
 2016-03-29 10:32:38 +00:00
Marin Jankovski af8df7e598 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2016-03-29 11:52:56 +02:00
Douwe Maan 98fbde5422 Merge branch 'rs-remove-wip-tabindex' into 'master' 
Remove tabstop from the WIP toggle links

[ci skip]

See merge request !3426
 2016-03-29 08:21:59 +00:00
Douwe Maan a7ca8689f7 Merge branch 'fix-14607' into 'master' 
Ensure private project snippets are not viewable by unauthorized people

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

See merge request !1946
 2016-03-29 08:21:48 +00:00
Grzegorz Bizon b7685b57d3 Redirect to root path when visiting /ci 2016-03-29 08:04:17 +02:00
Jacob Schatz 828ad5f68f Merge branch 'fix-dropdown-item-height' into 'master' 
Fix dropdown line height

**Before**

![Screen_Shot_2016-03-28_at_5.54.37_PM](/uploads/67681da80b9104924083f13af3833553/Screen_Shot_2016-03-28_at_5.54.37_PM.png)

**After**

![Screen_Shot_2016-03-28_at_5.57.37_PM](/uploads/5df14c2d131cc88dbc75b87959f56c3c/Screen_Shot_2016-03-28_at_5.57.37_PM.png)


See merge request !3431
 2016-03-29 01:45:15 +00:00
Jacob Schatz f734f49520 Merge branch 'fix_rightsidebar_overlapping_build_section' into 'master' 
Fix right sidebar overlapping build section in merge request

closes #14608 

![build](/uploads/d1902f5fa335274c92ac1b1a8193466f/build.gif)


See merge request !3415
 2016-03-29 01:26:21 +00:00
Alfredo Sumaran 7b8a4dd351 Set properly line heights 2016-03-28 17:57:59 -05:00
Robert Speicher 47a539dfd7 Use raw SQL instead of Rails models in migrations where appropriate 
Closes #14694.
 2016-03-28 18:03:29 -04:00
Jacob Schatz 795199bf04 Merge branch 'add_link_to_fork_counter_button' into 'master' 
Add link to forks pages in fork counter button

closes #14412 

![fork_link](/uploads/5afef05bc592b0cf1c90ae4d154aed87/fork_link.gif)

See merge request !3387
 2016-03-28 21:46:56 +00:00
Dmitriy Zaporozhets d73e128859 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-03-28 23:22:15 +02:00
Robert Speicher 8406318d87 Remove tabstop from the WIP toggle links 
[ci skip]
 2016-03-28 17:04:27 -04:00
Dmitriy Zaporozhets 55df9a70bf Merge branch 'functional-sidebar' into 'master' 
Updates sidebar to use new dropdowns for issues and merge requests

Fixes #12935, #13164 

See merge request !3175
 2016-03-28 20:59:13 +00:00
Robert Speicher 3385696bce Merge branch 'issue_14643' into 'master' 
Fix background when editing a highlighted note

Fixes #14643 

See merge request !3423
 2016-03-28 20:23:18 +00:00
Jacob Schatz 5449296fd6 Fix small style issue 2016-03-28 15:49:21 -04:00
Alfredo Sumaran 9e0890790f Remove background 
Fixes note's action bar background color when note is highlighted
 2016-03-28 13:59:19 -05:00
Achilleas Pipinellis bf7aac74a4 Merge pull request #9978 from fantasywind/patch-2 
Update github.md
 2016-03-28 20:40:59 +03:00
Jacob Schatz a5fb998010 Merge branch 'dz-small-ui-fixes' into 'master' 
Small ui fixes

- Dont use small font size for commits list    
- Use standard button size for new file
- Fix vertical align for files tab top navigation
- Add border bottom and margin for readme holder 


cc @skyruler @jschatz1 

See merge request !3419
 2016-03-28 17:08:40 +00:00
Drew Blessing fd279dd0a2 Merge branch 'update_ldap_docs' into 'master' 
Update ldap docs

Related to gitlab-org/gitlab-ee#397

@axil What do you think of moving LDAP configuration docs to `adminstration/auth/ldap.md`? Then we'll probably need to add the relevant group link configuration piece to some user group documentation. We can cross-link and deprecate the current `integration/ldap.md` location.

See merge request !3336
 2016-03-28 16:36:42 +00:00
Robert Speicher 8b5a8bdb25 Merge branch 'api-ability-to-backdate-newly-created-issues-12628' into 'master' 
Back dating of issues when creating through the API

Closes #12628 

See merge request !3408
 2016-03-28 16:31:17 +00:00
Zeger-Jan van de Weg 473b261261 Back dating of issues when creating throught the API 2016-03-28 16:45:36 +02:00
Dmitriy Zaporozhets 0f00a75df0 Dont use small font size for commits list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-28 11:38:06 +02:00
Dmitriy Zaporozhets ef4ca663fd Use standard button size for new file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-28 11:34:29 +02:00
Dmitriy Zaporozhets 3bb47bb6e0 Fix vertical align for files tab top navigation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-28 11:31:48 +02:00
Dmitriy Zaporozhets 6e86ef8452 Add border bottom and margin for readme holder 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-28 11:26:45 +02:00
Stan Hu 30e4d3ce9a Merge branch 'issue_14671' into 'master' 
Fix cancel button on issuables

Fixes #14671

See merge request !3417
 2016-03-28 07:24:20 +00:00
Alfredo Sumaran 5f6166a256 Fix cancel link 2016-03-28 01:35:53 -05:00
Robert Speicher ccf50e81b7 Merge branch 'upgrade-web-console' into 'master' 
Upgrade web-console to 2.3.0

Rails 5 compatibility release.

[See the Changelog for more information](https://github.com/rails/web-console/releases/tag/v2.3.0).

Working towards #14286.

See merge request !3400
 2016-03-27 22:23:42 +00:00
Robert Speicher a6a7a5ddd7 Merge branch 'upgrade-font-awesome' into 'master' 
Upgrade font-awesome-rails to 4.5.0.1

Includes Rails 5 support.

[See Changelog for details](https://github.com/bokmann/font-awesome-rails/releases/tag/v4.5.0.1).

Working towards #14286.

See merge request !3399
 2016-03-27 20:41:35 +00:00
Robert Speicher db0da43a46 Merge branch 'upgrade-brakeman' into 'master' 
Upgrade Brakeman from 3.1.4 to 3.2.1

Includes support for Rails 5, bug fixes, and various additional vulnerability checks.

[See Changelog for more information](https://github.com/presidentbeef/brakeman/blob/master/CHANGES).

Working towards #14286.

See merge request !3397
 2016-03-27 20:39:59 +00:00
Robert Speicher f7a9fc9cf8 Merge branch 'upgrade-teaspoon' into 'master' 
Upgrade Teaspoon from 1.0.1 to 1.1.5.

Includes compatibility with Rails 5.

See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md).

Working towards #14286.

See merge request !3409
 2016-03-27 20:38:26 +00:00
Robert Speicher 8edb316392 Merge branch 'upgrade-bullet' into 'master' 
Upgrade Bullet to 5.0.0

Includes Rails 5 support.

[See changelog for details](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).

Working towards #14286.

See merge request !3396
 2016-03-27 20:37:30 +00:00
Achilleas Pipinellis cff3142313 Merge branch 'bug-in-webhooks-documentation-14660' into 'master' 
Fix typos in webhooks docs



See merge request !3416
 2016-03-27 18:55:24 +00:00
Achilleas Pipinellis ac7d4a4084 Fix typos in webhooks docs. 
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14660
 2016-03-27 18:10:10 +00:00
Arinde Eniola feee6dab10 fix right sidebar overllaping build section in merge request 2016-03-27 16:33:51 +01:00
Stan Hu c1834664a7 Merge branch 'handle-avatar-in-empty-repo' into 'master' 
Don't attempt to look up an avatar in repo if repo directory does not exist

Relates to https://sentry.gitlap.com/gitlab/gitlabcom/issues/3507/

Closes #14580



See merge request !3390
 2016-03-27 00:21:57 +00:00
Jacob Schatz 8034e1a154 Merge branch 'feature/fuzz-search-min-width' into 'master' 
Fuzzy search dropdown UI element min-width (issue 14644)

Short project names sometimes result in an unusable fuzzy search UI element. Therefore, I added a min-width CSS property with a value of 175px.

See here for details but it's fairly straight forward:
https://gitlab.com/gitlab-org/gitlab-ce/issues/14644

Before:
<br />
![Screen_Shot_2016-03-25_at_20.03.54](/uploads/2bdc048bd818cdcd228bb2d19a10b5d2/Screen_Shot_2016-03-25_at_20.03.54.png)

After:
<br />
![Screen_Shot_2016-03-25_at_20.19.29](/uploads/be23938757f67ffebb96c9bdc8229c5b/Screen_Shot_2016-03-25_at_20.19.29.png)

See merge request !3407
 2016-03-26 23:11:48 +00:00
Jacob Schatz 88007c3d77 Update, so filtering works properly. 
Bulk update works as well
 2016-03-26 09:30:37 -04:00
Dmitriy Zaporozhets 1922e3a838 Bump VERSION 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-26 11:16:25 +01:00
Dmitriy Zaporozhets ea8bd204e3 Merge branch 'feature--preferences-dashboard-groups' of https://gitlab.com/eliasw/gitlab-ce 2016-03-26 11:08:48 +01:00
Dmitriy Zaporozhets c44de4f21e Merge branch 'rs-remove-release-docs' into 'master' 
Remove release docs from the CE repository

More detailed, updated, and accurate versions of these docs now live in
https://gitlab.com/gitlab-org/release-tools

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

[ci skip]

See merge request !3393
 2016-03-26 10:07:04 +00:00
Dmitriy Zaporozhets 2fdf928afa Merge branch 'ci-setup-info' into 'master' 
Add links to CI setup documentation from project settings and builds pages

For #14483 

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

See merge request !3384
 2016-03-26 09:57:47 +00:00
connorshea e664d95437 Upgrade Teaspoon from 1.0.1 to 1.1.5. 
Includes compatibility with Rails 5.

See the changelog for more information (https://github.com/modeset/teaspoon/blob/master/CHANGELOG.md).
 2016-03-25 15:48:13 -06:00
Grant Douglas 26aa2a6e67 short project names result in unusable fuzz search UI elements, so added a min-width property to the css 
Added a space between property colon and value to satisfy linter and pass build.
 2016-03-25 21:21:44 +00:00
Jacob Schatz 07d87d15f0 Fix filter so it works with new multi select drop-downs. 2016-03-25 16:42:28 -04:00
Rémy Coutable 4f07c0a107 Ensure project snippets have their own access level 2016-03-25 18:51:17 +01:00