home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 07:36:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,836 Commits 48 Branches 340 Tags
fcb85381cf025da5e8cfecdc1a4afc016b5cb6ae
Commit Graph
25836 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Lopez fcb85381cf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url 2016-03-28 09:37:55 +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
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 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
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
Stan Hu 506878970b Don't attempt to look up an avatar in repo if repo directory does not exist 
Closes #14580
 2016-03-25 06:30:51 -07:00
Dmitriy Zaporozhets ed8e1faa4c Make sure Repository#gitlab_ci_yml is safe to use even when repository is missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 14:19:20 +01:00
Dmitriy Zaporozhets 9e7e2c6b9d Small refactoring and rewording 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-25 13:18:55 +01:00
Achilleas Pipinellis 63c8a05bf7 Merge branch 'clarify_lfs' into 'master' 
Clarify LFS configuration

A user on Twitter was confused (rightfully so) because LFS admin docs suggest you must set a storage path. In fact, Omnibus defaults to a very sane location. Add a comment to the snippet outlining the default.

See merge request !3388
 2016-03-25 09:11:08 +00:00
connorshea f967d5cf3d 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)
 2016-03-24 21:48:06 -06:00
connorshea 2fe8da0b50 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
 2016-03-24 21:29:12 -06:00
connorshea 057244b4c0 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
 2016-03-24 20:28:24 -06:00
connorshea 8d2ded95c8 Upgrade Bullet to 5.0.0 
Includes Rails 5 support. See changelog for details
(https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md).
 2016-03-24 20:21:32 -06:00
Sytse Sijbrandij 28c94ee955 Describe CI stuff. 2016-03-24 17:43:37 -07:00
Robert Speicher 6abcb8820d 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

[ci skip]
 2016-03-24 18:03:06 -04:00
Robert Speicher 3028a7d25a Merge branch 'issue_14610' into 'master' 
Fix cancel button on issuable edit form

See merge request !3392
 2016-03-24 20:13:53 +00:00
Alfredo Sumaran 35ef7ff6cb Fix link when issuable is new 2016-03-24 14:40:20 -05:00
Alfredo Sumaran 7f43049012 Fix cancel link on issuable edit form 2016-03-24 14:29:09 -05:00
Elias Werberich c3a98d8fcc Implementing 'Groups View' and 'TODOs View' as options for dashboard preferences. 
Fixes #14585.
 2016-03-24 19:59:54 +01:00
Douwe Maan 5a460c3796 Merge branch 'fix-comments-on-confidential-issues-show-activity-feed-for-non-members' into 'master' 
Comments on confidential issues doesn't show in activity feed to non-members

Closes #14568 

See merge request !3375
 2016-03-24 18:06:42 +00:00
Douglas Barbosa Alexandre 39a51f9e1c Rename Event#proper? to Event#visible_to_user? 2016-03-24 14:24:22 -03:00
Douglas Barbosa Alexandre 239560331a Comments on confidential issues doesn't show in activity feed to non-members 2016-03-24 14:22:01 -03:00
Jacob Schatz 6b95be1ddd Merge branch 'project-dropdown-width' into 'master' 
Fixed issue with width of project select dropdown

Before:

![Screen_Shot_2016-03-24_at_13.42.53](/uploads/25580c45dc339f7f932f032ac2d10fba/Screen_Shot_2016-03-24_at_13.42.53.png)

![Screen_Shot_2016-03-24_at_13.43.04](/uploads/e4d1d4e332d27f14c980264bef9dc4d9/Screen_Shot_2016-03-24_at_13.43.04.png)

After:

![Screen_Shot_2016-03-24_at_13.42.38](/uploads/68b8e161d86b41849f9e8a1d9c8fd36c/Screen_Shot_2016-03-24_at_13.42.38.png)

![Screen_Shot_2016-03-24_at_13.43.13](/uploads/f3fe732bcd517efea3a1d7c761bb6a0e/Screen_Shot_2016-03-24_at_13.43.13.png)

See merge request !3386
 2016-03-24 15:59:27 +00:00
Drew Blessing 2da8204ff5 Clarify LFS configuration 2016-03-24 10:00:27 -05:00
Dmitriy Zaporozhets b105b84e3a Use head tree (cached) for file search. Also add some tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-24 15:38:16 +01:00
Jacob Schatz c87adc4e4d Merge branch 'sidebar-bold-fix' into 'master' 
Fixed bold in sidebar

![Screen_Shot_2016-03-23_at_12.01.54](/uploads/d50ae3426efcb2436b3debdd80073b2f/Screen_Shot_2016-03-23_at_12.01.54.png)

This is to go with https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/289

See merge request !3358
 2016-03-24 14:33:00 +00:00
Jacob Schatz f565e126d2 Merge branch 'fix-password-settings-regressions' into 'master' 
Shows password form when signed in with linked account

Closes #14379

Doing this to get the builds passing for !3325

See merge request !3381
 2016-03-24 14:26:50 +00:00
Dmitriy Zaporozhets 3b1543cd15 Detect build setup state based on gitlab_ci.yml presense 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-24 15:17:13 +01:00
Douwe Maan baf41fd7cf Merge branch 'lease-design-comments' into 'master' 
Explain why ExclusiveLease has no #cancel

[ci skip]

See merge request !3383
 2016-03-24 14:12:20 +00:00