Commit Graph
24947 Commits
Author SHA1 Message Date
Alfredo Sumaran bfcf6a045c Use full URL to reference issues 2016-03-10 14:31:21 -05:00
Alfredo Sumaran 3a156eb73d Prevent .max-width-marker to break layout on mobile 2016-03-10 13:14:10 -05:00
Alfredo Sumaran 4dd1d6c401 Avoid blinking of editor area on iOS 2016-03-10 13:10:40 -05:00
Jacob Schatz 3d4063efa1 Merge branch 'download-button-flicker' into 'master'
Fixed flicker of download project button

Closes #14177

![download-button-flicker](/uploads/21e8ccc68ed66394c8ec65ca549f94ad/download-button-flicker.gif)

See merge request !3152
2016-03-10 15:20:17 +00:00
Jacob Schatz 8179f4fc0c Merge branch 'roperzh/gitlab-ce-issue-13334' into 'master'
Decrease the font size and the padding of the `.anchor` icons used in the README

_Originally opened at !2819 by @roperzh._

- - -

## What does this MR do?

Removes an overlap between the anchor icons on the readme and the sidebar on small screens by reducing the size and the padding of the icon.

## Are there points in the code the reviewer needs to double check?

Probably someone in the Design / UX team will need to review if the solution makes sense.

## What are the relevant issue numbers?

Issue #13334

## Screenshots

![Screen_Shot_2016-02-15_at_3.35.13_PM](/uploads/0e8b215809eee8efec9b6a136b0bd841/Screen_Shot_2016-02-15_at_3.35.13_PM.png)

See merge request !3150
2016-03-10 15:18:37 +00:00
Douwe Maan 38823e3e83 Merge branch 'optimize-project-ci-services' into 'master'
Optimize Project#ci_service(s)

Related issue: gitlab-org/gitlab-ce#14186

See merge request !3158
2016-03-10 15:08:21 +00:00
Jacob Schatz a1f4531069 Merge branch 'quick-submit-note-edit' into 'master'
Fixed quick submit on note edit

Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there

Closes #14094

See merge request !3151
2016-03-10 14:34:03 +00:00
Yorick Peterse f2992cf343 Optimize Project#ci_service(s)
The method Project#ci_services would load all services into memory
(including _all_ their columns) and then use Enumerable#select to reduce
the list. Project#ci_service in turn would further reduce this list down
to just 1 Service instance.

Instead of doing all this in Ruby we can just offload the work to the
database, reducing the amount of time spent in these methods. These
changes reduce the time of the first call to Project#ci_services from
around 240 ms to around 10 ms, though the final timings will vary based
on database load. Because Project#ci_service is memoized there's no
further overhead introduced by using a database query.

Fixes gitlab-org/gitlab-ce#14186
2016-03-10 15:32:31 +01:00
Jacob Schatz b9c9948ff8 Merge branch 'copy-markdown-snippet' into 'master'
Fixes issue with markdown snippet not being copyable

On markdown snippets this adds a hidden div with the raw markdown content so that it can be copied

Closes #13882

See merge request !3153
2016-03-10 14:20:48 +00:00
Jacob Schatz 198926dc7f Merge branch 'enhanced-dropdow-css' into 'master'
New dropdown UI

See #3279 for the designs

See merge request !3110
2016-03-10 13:47:32 +00:00
Phil Hughes 704f468376 Replaced hidden div for textarea off-the screen
Element with the content being copied cant be hidden so instead i\'ve moved it off the screen
2016-03-10 13:34:31 +00:00
Jacob Schatz 60ddd5ef34 Merge branch 'fix-projects-ajax-pagination' into 'master'
Fix projects pagination via ajax

Basically was not implemented. Finishes our projects list refactoring. 

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

See merge request !3155
2016-03-10 13:24:16 +00:00
Dmitriy Zaporozhets 83593e461a Use modern syntax
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10 13:55:01 +01:00
Dmitriy Zaporozhets ec52d5b14f Fix projects pagination via ajax
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-10 13:41:23 +01:00
Phil Hughes a0c4f3dfa9 Fixes issue with markdown snippet not being copyable
On markdown snippets this adds a hidden div with the raw markdown content so that it can be copied

Closes #13882
2016-03-10 12:15:00 +00:00
Phil Hughes 573bbd674b Fixed flicker of download project button
Closes #14177
2016-03-10 11:52:31 +00:00
Phil Hughes 3c6fdc7a0a Fixed quick submit on note edit
Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there

Closes #14094
2016-03-10 11:02:22 +00:00
Roberto DipandRémy Coutable f17de3c2eb Decrease the font size and the padding of the .anchor icons
This commit fixes #13334, removing an overlap between the
anchor icon and the sidebar
2016-03-10 11:23:37 +01:00
Phil Hughes 22b89f35c7 Dropdown toggle button styling 2016-03-10 08:35:46 +00:00
Phil Hughes 8651137a4f Dropdown variables 2016-03-10 08:35:46 +00:00
Phil Hughes c6f516626d Added CSS for new dropdowns
See #3279 for the designs
2016-03-10 08:35:46 +00:00
Robert Speicher 491ac7ce4b Merge branch 'issue-referenced-merge-requests-specs' into 'master'
Added specs for Issue#referenced_merge_requests

Added these while looking into https://gitlab.com/gitlab-org/gitlab-ce/issues/13651.

See merge request !3125
2016-03-10 04:06:52 +00:00
Yorick PeterseandRobert Speicher e32726c636 Added specs for Issue#referenced_merge_requests 2016-03-09 22:30:55 -05:00
Jacob Schatz 60d0a20b3a Merge branch 'markdown_preview_shortcut' into 'master'
Add shortcut to toggle markdown preview

Allow to toggle markdown preview with shortcut `ctrl+shift+p` (`cmd+shift+p` on OSX).

- If the user is focused on a md textarea, `ctrl-shift-p` will show the preview, otherwise native browser event is fired
- The textarea is re-focused after disabling the preview tab
- Results of markdown render is cached for fast toggles

I'm on linux, so if someone can test it on OS X, it would be great!

Closes #14038

See merge request !3111
2016-03-10 01:50:22 +00:00
Baldinof a5079d2195 Merge branch 'master' into markdown_preview_shortcut 2016-03-09 22:54:53 +01:00
Kamil Trzciński d9042e8b39 Merge branch 'retry-bundle' into 'master'
Retry bundler and apt-get



See merge request !3146
2016-03-09 21:09:12 +00:00
Robert Speicher 8e3485d878 Merge branch 'fix-git-push-service-specs' into 'master'
Fixed the GitPushService specs

See merge request !3139
2016-03-09 20:42:14 +00:00
Kamil Trzcinski 3da55e37d0 Retry bundler and apt-get 2016-03-09 21:22:25 +01:00
Dmitriy Zaporozhets fdfcc1ac0d Merge branch 'rs-sprite-task' into 'master'
Add a `gemojione:sprite` Rake task

This task will generate a standard and Retina sprite of all of the
current Gemojione Emojis, with the accompanying SCSS map.

It will not appear in `rake -T` output, and the dependent gems are not
included in the Gemfile by default, because this task will only be
needed occasionally.

See merge request !3130
2016-03-09 19:32:08 +00:00
Douglas Barbosa Alexandre 00a19f323b Merge branch 'fix-todos' into 'master'
Fix error 500 in Todos

Closes #14095 

Closes #14075 

Closes #14109

Closes #14151

See merge request !3141
2016-03-09 19:22:43 +00:00
Douglas Barbosa Alexandre b100a9f206 Update CHANGELOG 2016-03-09 16:21:53 -03:00
Douglas Barbosa Alexandre 7500a12aae Avoid error 500 when todo author was removed 2016-03-09 14:47:04 -03:00
Robert Speicher e443c7c6d8 Add a gemojione:sprite Rake task
This task will generate a standard and Retina sprite of all of the
current Gemojione Emojis, with the accompanying SCSS map.

It will not appear in `rake -T` output, and the dependent gems are not
included in the Gemfile by default, because this task will only be
needed occasionally.

[ci skip]
2016-03-09 12:44:48 -05:00
Jacob Schatz 48fc02d24c Merge branch 'snippet-visibility-spacing' into 'master'
Snippet visibility badge spacing

Closes #14074 

![Screen_Shot_2016-03-08_at_08.40.32](/uploads/f55ca724fbf0e247b299a2702c3b55f5/Screen_Shot_2016-03-08_at_08.40.32.png)

See merge request !3122
2016-03-09 17:39:14 +00:00
Baldinof a603422edb Fix typo in shortcuts help 2016-03-09 17:13:21 +00:00
Jacob Vosmaer 5e46662798 Merge branch 'commit-limits' into 'master'
Commit limits

Prevent timeouts when creating/viewing Merge Requests with many
commits. Also, reduce the number of commits shown in the UI from 500
to 100.

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

This MR avoids Unicorn timeouts in some places and takes 4.5 seconds
off load times in others, when manually testing with a 4500-commit
compare/MR in the linux repo. It does not limit the number of Commit
objects instantiated in memory, just the amount of HTML generated. It
seems that having 4500 commits objects is not a problem in itself. If
it ever becomes one we could do something for Commit objects like we
did for Diff (introduce a CommitCollection or something).

See merge request !3095
2016-03-09 16:39:07 +00:00
Dmitriy Zaporozhets e72ae40c95 Merge branch 'rs-bump-poltergeist' into 'master'
Bump poltergeist to `~> 1.9.0`



See merge request !3116
2016-03-09 16:15:34 +00:00
Yorick Peterse 53719ecb80 Handle permissions for ExternalIssue instances
This fixes the remainder of the GitPushService specs.
2016-03-09 17:10:43 +01:00
Yorick Peterse 96d35c5975 Fixed part of the GitPushService specs
These were broken by commit 21a05328ff.
Two JIRA tests remain broken but I can't quite figure out how to fix
them.
2016-03-09 17:10:43 +01:00
Douglas Barbosa Alexandre cac83cead5 Update CHANGELOG 2016-03-09 11:18:37 -03:00
Douglas Barbosa Alexandre 22140ced0b Remove invalid todos from database 2016-03-09 11:18:13 -03:00
Kamil Trzciński 5956ddd8b2 Merge branch 'retry-tests' into 'master'
Retry failed tests

This is to make the CI builds more reliable due to large amount of timeouts and deadlocks recently.


See merge request !1793
2016-03-09 14:08:19 +00:00
Douglas Barbosa Alexandre 9e342fb00a Destroy all related todos when removing a project 2016-03-09 11:06:58 -03:00
Kamil Trzcinski b651cd227e Fix script error 2016-03-09 14:26:49 +01:00
Kamil Trzcinski 978703abe2 Retry apt-get installation and bundle install 2016-03-09 14:22:32 +01:00
Kamil Trzcinski af43401602 Retry spinach tests 2016-03-09 14:22:32 +01:00
Kamil Trzcinski 640bf8ab72 Retry failed tests 2016-03-09 14:21:19 +01:00
Rémy Coutable 500337c4b2 Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master'
Fix bug where Bitbucket 'closed' issues were imported as 'opened'

_Originally opened at !2930 by @iurisilvio._

- - -

Bitbucket has an undocumented status `closed`.

https://confluence.atlassian.com/bitbucket/issues-resource-296095191.html

Related to https://gitlab.com/gitlab-com/support-forum/issues/559

See merge request !2973
2016-03-09 12:54:52 +00:00
Yorick Peterse 2af9326c34 Merge branch 'update-db-schema' into 'master'
See merge request !3136
2016-03-09 12:53:55 +00:00
Yorick Peterse c666441d40 Added main_language to the schema
This wasn't included in gitlab-org/gitlab-ce!3000.
2016-03-09 12:35:24 +01:00