home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,795 Commits 48 Branches 340 Tags
720ef51bd97f478dba2d2c1b59df958dabd7500a
Commit Graph
13249 Commits
Author SHA1 Message Date
Stan Hu 720ef51bd9 Check if repo exists before attempting to update cache info 
Closes #14361
 2016-03-27 06:17:49 -07: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 ea8bd204e3 Merge branch 'feature--preferences-dashboard-groups' of https://gitlab.com/eliasw/gitlab-ce 2016-03-26 11:08:48 +01: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
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 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 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
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
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
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
Phil Hughes 91d5876ea2 Fixed issue with width of project select dropdown 2016-03-24 13:43:35 +00:00
Dmitriy Zaporozhets d21b3a0211 Add links to CI setup documentation from project settings and builds pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-24 14:16:21 +01:00
Zeger-Jan van de Weg 221c917c6c Add tooltip to new branch button 2016-03-24 13:00:33 +01:00
Phil Hughes 4d7671e74d HAML style fix 2016-03-24 11:38:00 +00:00
Phil Hughes 6a5b3a5c8f Shows password form when signed in with linked account 
Closes #14379
 2016-03-24 11:22:44 +00:00
Rémy Coutable 2824972c36 Fix specs broken by !3270 and !3337. 2016-03-24 10:10:46 +01:00
Jacob Schatz 4a4a79aa9e Merge branch 'dropdown-alignment-fixes' into 'master' 
Dropdown pixel perfect 🎉

Closes #14333, #14331, #14472, #14515 

See merge request !3337
 2016-03-23 22:13:31 +00:00
Jacob Schatz 4798b927ab Merge branch 'issue_7959' into 'master' 
Crop avatars on the client before upload

<img src="/uploads/535d69956cc5904870ae5d95132a35af/Screen_Shot_2016-03-17_at_9.55.56_AM.png" width="700">

closes #7959
closes #600 

See merge request !3270
 2016-03-23 20:29:30 +00:00
Jacob Schatz b45423c5fb Merge branch 'issue-sidebar-overlap' into 'master' 
Issue sidebar overlaps on tablet

Closes #14180

![Screen_Shot_2016-03-18_at_13.10.53](/uploads/d1e81778740a034aa98c881a70e55254/Screen_Shot_2016-03-18_at_13.10.53.png)

See merge request !3299
 2016-03-23 20:10:00 +00:00
Robert Speicher f49e9e8f77 Merge branch 'update-issues-tests' into 'master' 
Multi-update issues tests

There were no tests for updating multiple issues at a time - this fixes
that 👍 

See merge request !3357
 2016-03-23 19:59:42 +00:00
Jacob Schatz 00246d3f01 Merge branch 'fix_missing_tooltip_next_to_project_title' into 'master' 
Fix missing tooltip in project title

closes #14516 

![tooltip](/uploads/121cc3676f4f32044e158cf5f3df5be5/tooltip.gif)

See merge request !3351
 2016-03-23 19:16:05 +00:00
Robert Speicher 33b1bbba67 Merge branch 'fix-application-settings' into 'master' 
Fixed error with applications delete anonymous token form

Closes #14509 

See merge request !3362
 2016-03-23 18:12:01 +00:00
Phil Hughes 07a1da7e40 Removed hover background that wasn't needed 2016-03-23 17:21:02 +00:00
Phil Hughes 2d7183bbe8 Fixed failing tests 
Moved the scss out of a mixin as it was really confusing the hell out of the CSS
 2016-03-23 17:15:14 +00:00
Phil Hughes e94482d149 Issue sidebar overlaps on tablet 2016-03-23 17:15:14 +00:00
Alfredo Sumaran 128c109a34 Move cropper.css to vendor folder 2016-03-23 11:56:14 -05:00
Alfredo Sumaran 3bab5976c0 Move cropper.js to vendor folder 2016-03-23 11:54:04 -05:00
Robert Speicher 0e85a8b816 Merge branch 'issue_14453' into 'master' 
Strip commit title when creating revert commit.

Fixes #14453 

See merge request !3352
 2016-03-23 16:46:23 +00:00
Robert Speicher 1f5d5af423 Merge branch 'fix-milestone-upcoming' into 'master' 
Fix Milestone.upcoming

The order wasn't happening because of `default_scope`. Blegh.

See merge request !3364
 2016-03-23 15:51:29 +00:00
Jacob Schatz 384a82f1a3 Merge branch 'dropdown-right-align' into 'master' 
Dropdown alignment

Hopefully the JS will stop this happening in future as well!

Closes #14386 

![Screen_Shot_2016-03-18_at_12.54.32](/uploads/d11b51d3577df3a19b8b3a0fd7b69788/Screen_Shot_2016-03-18_at_12.54.32.png)

See merge request !3298
 2016-03-23 15:24:21 +00:00
Douwe Maan b651a4fd41 Fix Milestone.upcoming 2016-03-23 15:09:58 +00:00
Phil Hughes c23d9ab4ed Fixed error with applications delete enonymous token form 
Closes #14509
 2016-03-23 13:59:54 +00:00
Douwe Maan a29c195423 Merge branch 'split-with-2' into 'master' 
Make sure we get only two returns

@DouweM The other change I made which has nothing to do with Gitlab::Email::Receiver

See merge request !3360
 2016-03-23 13:58:21 +00:00
Phil Hughes 0141d3654f Disable new label form in dropdown until fields are complete 2016-03-23 13:29:41 +00:00
Douwe Maan 6c4d6dd684 Merge branch 'fix/issue-move-preserve-update-time' into 'master' 
Preserve time notes has been updated at when moving issue

Closes #14490

See merge request !3356
 2016-03-23 13:11:27 +00:00