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,857 Commits 48 Branches 340 Tags
55df9a70bf3fb7fffa7491d53d3cf643d61de1c8
Commit Graph
25857 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jacob Schatz 43e49f52e3 Merge branch 'fix-link-colors' into 'master' 
Fix link colors after recent UI refactoring

cc @jschatz1 

See merge request !3404
 2016-03-25 17:47:08 +00:00
Jacob Schatz d903465c25 Using class for specificity instead of tag. 2016-03-25 13:16:10 -04:00
Dmitriy Zaporozhets 179bae9968 rescue Rugged::ReferenceError in Repository#gitlab_ci_yml method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 17:54:57 +01:00
Jacob Schatz 1445bfa18d Use hidden inputs instead of data-selected 2016-03-25 12:44:33 -04:00
Dmitriy Zaporozhets 3dc0c3e473 For some reason this test fails without javascript so added it 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 16:19:24 +01:00
Dmitriy Zaporozhets 80c3cbfb1d Make sure ci status colors are same and respected on most pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:55:08 +01:00
Dmitriy Zaporozhets 02b585e924 Repository breadcrumbs and file header links should be dark 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:48:00 +01:00
Dmitriy Zaporozhets 1853d71543 Fix link colors by using content-list for commits 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:40:51 +01:00
Dmitriy Zaporozhets b5c9637c92 Make sure CI status icons have same color across all app 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 15:31:19 +01:00
Jacob Schatz 1cc6d786e4 Fix minor code style issues 
Fix underscore template error.
Fix `=` spacing
 2016-03-25 09:54:05 -04:00
Jacob Schatz 53a831124e Edit button leaves modal open 
Add user avatar to user selection
 2016-03-25 09:54:05 -04:00
Jacob Schatz 6835f19c2b Add back in currentUser 2016-03-25 09:54:05 -04:00
Jacob Schatz 42389ea8d2 Fix features until tests pass. 
Milestones needed a none selector
Assignee needed unassign.
 2016-03-25 09:54:05 -04:00
Phil HughesandJacob Schatz 139c255a92 Fixed JS error that was failing the builds 2016-03-25 09:54:05 -04:00
Phil HughesandJacob Schatz cf0c6e87ea Fixed some colours in sidebar 2016-03-25 09:54:05 -04:00
Jacob Schatz 201101dfff Add Assign to me button and unassigned. 2016-03-25 09:53:14 -04:00
Jacob Schatz 5db2622aea Assign current user when no user is assigned link 2016-03-25 09:53:14 -04:00
Jacob Schatz f649126095 Add js-extras so show any and show no for milestones show up. 2016-03-25 09:48:12 -04:00
Jacob Schatz 3fc887ea02 Remove console log 2016-03-25 09:48:12 -04:00