Commit Graph
25387 Commits
Author SHA1 Message Date
Yorick Peterse 3f0d780c19 Show a notice for diffs that are too large
This builds on the changes introduced in
https://gitlab.com/gitlab-org/gitlab_git/merge_requests/72 and results
in merge requests with large diffs (e.g. due to them containing minified
CSS) loading much faster.
2016-03-18 12:30:46 +01:00
Jacob Schatz bdbc988434 Merge branch 'improve-diff-ui' into 'master'
Add space to separate different files in diff

I propose to add some visual separation between files in diff. Originally this separation was removed in 8.0 because of different UI layout. Now when we have white layout back I think it will be better to add some space between files. 

- - - 

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


See merge request !3275
2016-03-18 11:29:32 +00:00
Jacob Vosmaer bca8ea33b3 Merge branch 'project-cache-worker-without-diverging' into 'master'
Removed diverging commit count calculation from Repository#build_cache

Using a repository with 1000 branches the old `Repository#build_cache` method would take around 180 seconds to complete. Without calculating the diverging commit counts this method "only" takes around 60 seconds. 

See commit 28cc2413eb5ddf920ce0b5eed803121f8b884754 for more details. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14058

cc @rspeicher 

See merge request !3274
2016-03-18 11:28:54 +00:00
Jacob Schatz 4cd87d31bd Merge branch 'optimistic-todos' into 'master'
Adds small AJAX optimistic functionality to todos.

Fixes #13656 <br/>
A good first step and boring solution. <br/>
Will make ajax call to remove each issue.  <br/>
If issue is last in group of issues will refresh page.  <br/>
If issues remain in group will remove row with JS.  <br/>
Adds loading spinner to button and disables. <br/>

![todos-optimistic](/uploads/c6aec4a688e5125d4df55a2a3a55d4d7/todos-optimistic.gif) <br/>

cc @dzaporozhets @JobV @dbalexandre 

See merge request !2946
2016-03-18 11:23:16 +00:00
Jacob Schatz ad04a91188 Merge branch 'fix-any-milestone-value' into 'master'
Fixes issue with any milestone value in dropdown not being selectable

Closes #14293

See merge request !3234
2016-03-18 10:46:56 +00:00
Phil Hughes fa6fae18a9 Changed any variable name to save confusion 2016-03-18 09:49:44 +00:00
Phil Hughes 72830aa809 Removed comparing against text 2016-03-18 09:48:47 +00:00
Phil Hughes 8357a23ac8 Fixes issue with any milestone value in dropdown not being selectable
Closes #14293
2016-03-18 09:48:47 +00:00
Dmitriy Zaporozhets fde975facc Merge branch 'fix-group-members-ui' into 'master'
Add side padding to content-list if inside panel

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

Fixes #14367, #14349

See merge request !3273
2016-03-18 08:46:57 +00:00
Achilleas Pipinellis 8edb133f7b Merge branch 'fix-issue-14338' into 'master'
Use relative links in `doc`, fix broken generated HTML links

Links like (doc/web_hooks/web_hooks.md) work in the GitLab source code
web interface, but the HTML generator produces broken links in the `doc`
subdirectories:  
http://doc.gitlab.com/ce/hooks/doc/web_hooks/web_hooks.html  
instead of the right one  
http://doc.gitlab.com/ce/web_hooks/web_hooks.html  
in  
http://doc.gitlab.com/ce/hooks/custom_hooks.html.

Fixes #14338 


See merge request !3261
2016-03-18 07:44:47 +00:00
Achilleas Pipinellis 18c2b1983a Merge branch 'ci-duplication' into 'master'
Remove CI duplication.



See merge request !3290
2016-03-18 06:51:30 +00:00
Sytse Sijbrandij 4eb9711b46 Remove CI duplication. 2016-03-17 21:52:34 -07:00
Robert Speicher fc75de7dc2 Merge branch 'improve-award-emoji-spinach-tests' into 'master'
Improve award emoji test reliability by checking that the emoji is displayed before the search field is focused

See merge request !3288
2016-03-18 01:27:52 +00:00
Robert Speicher 4c517ce6dc Merge branch 'issue_14374' into 'master'
Check push permissions only when pushing directly to target branch.

Fixes #14374 

See merge request !3280
2016-03-18 01:21:07 +00:00
Stan Hu 0901d51724 Improve award emoji test reliability by checking that the emoji is displayed
before the search field is focused
2016-03-17 17:34:15 -07:00
Jacob Schatz abaf7ed2e5 Merge branch 'fix_dropdown_getting_cut_off_in_page' into 'master'
Fix bug causing dropdown to get cut off in project page

closes #14336 

### Before
![Screen_Shot_2016-03-16_at_11.30.40_PM](/uploads/9f8dd10f0627cdfbd49d7127b233b105/Screen_Shot_2016-03-16_at_11.30.40_PM.png)

![Screen_Shot_2016-03-16_at_11.30.53_PM](/uploads/6dfe64d68867d158a11be7e74cbd1520/Screen_Shot_2016-03-16_at_11.30.53_PM.png)


### After
![Screen_Shot_2016-03-16_at_11.30.14_PM](/uploads/2b87cc17522e8a425a97a78b36982873/Screen_Shot_2016-03-16_at_11.30.14_PM.png)

See merge request !3257
2016-03-17 23:13:48 +00:00
Jacob Schatz 09a32fa886 Merge branch 'fix_issue_mr_page_inconsistency' into 'master'
Fix inconsistency in the header of issue and merge request pages

closes #13550 

# For Issue Page

### Before
![Screen_Shot_2016-03-17_at_8.46.59_PM](/uploads/ede7f2b98395362ae87e6258cc10520a/Screen_Shot_2016-03-17_at_8.46.59_PM.png)

### After
![Screen_Shot_2016-03-17_at_8.48.56_PM](/uploads/da7adf17cb397ddc0677a6a5e8033b8e/Screen_Shot_2016-03-17_at_8.48.56_PM.png)

# For Merge request Page

### Before
![Screen_Shot_2016-03-17_at_8.45.45_PM](/uploads/10137827c05c8166a0aa429687e50d1b/Screen_Shot_2016-03-17_at_8.45.45_PM.png)

### After
![Screen_Shot_2016-03-17_at_8.45.01_PM](/uploads/92151c03cfe29b71090a1e0ad31abd6e/Screen_Shot_2016-03-17_at_8.45.01_PM.png)


See merge request !3279
2016-03-17 22:58:37 +00:00
Jacob Schatz 73ba88b539 Merge branch 'download-dropdown-alignment' into 'master'
Fixed alignment of download dropdown

With the new dropdown CSS - some dropdowns might look a bit odd

## Previously

![Screen_Shot_2016-03-16_at_11.46.04](/uploads/c1a8fc95ed4410de35d7bd5caedf28f5/Screen_Shot_2016-03-16_at_11.46.04.png)

## Now

![Screen_Shot_2016-03-16_at_11.45.26](/uploads/998637fe0872b2e826a8c17d183499dc/Screen_Shot_2016-03-16_at_11.45.26.png)

See merge request !3245
2016-03-17 21:47:03 +00:00
Jacob Schatz 1ffb32ed61 Merge branch 'filter-spacing' into 'master'
Fixed filter spacing

Closes #14350

![Screen_Shot_2016-03-17_at_10.21.33](/uploads/5b8f39134cc90ce1dd6565f665a39838/Screen_Shot_2016-03-17_at_10.21.33.png)

See merge request !3267
2016-03-17 21:45:08 +00:00
Robert Speicher 7562375e6f Merge branch 'git-2-7-4' into 'master'
Bump Git version requirement to 2.7.4

[ci skip]

See merge request !3281
2016-03-17 21:42:35 +00:00
Arinde Eniola 613e0bc541 Fix inconsistency in the header of issue and merge request pages 2016-03-17 22:34:42 +01:00
Douwe Maan 5833ae0c5e Merge branch 'master' into git-2-7-4 2016-03-17 22:23:31 +01:00
Douwe Maan 515dd63d65 Bump Git version requirement to 2.7.4 2016-03-17 22:21:10 +01:00
Yorick Peterse dd4b789765 Added tests for Repository#build_cache 2016-03-17 21:45:43 +01:00
Yorick Peterse 3d7feeede3 Don't rebuild diverging commit count caches
When calling Repository#build_cache we _don't_ want to build the
diverging commit count cache as doing so can be _very_ slow for
repositories with lots of branches. Because these caches are built
whenever needed (= when actually viewing the list of branches in the web
UI) we can safely remove this code from
Repository#build_cache.
2016-03-17 21:43:38 +01:00
Yorick Peterse 81d191ede9 Removed Repository#rebuild_cache
This method is not used or tested anywhere.
2016-03-17 21:43:38 +01:00
Robert Speicher dc396d0fa4 Merge branch 'edited-text' into 'master'
Edited timeago text on comments

Unified the 'edited text' to be the same in descriptions and comments

Closes #5538 

See merge request !3063
2016-03-17 20:35:06 +00:00
Rubén Dávila cfb10c103f Check push permissions only when pushing directly to target branch. 2016-03-17 15:16:34 -05:00
Jacob Schatz ab9970e22c Merge branch 'blue-links-fix' into 'master'
Revert color for links inside gray areas

**Before**

![Screen_Shot_2016-03-17_at_12.23.17_PM](/uploads/55e518721d83c3bfc42edba3e97ec44d/Screen_Shot_2016-03-17_at_12.23.17_PM.png)

**After**

![Screen_Shot_2016-03-17_at_12.23.03_PM](/uploads/08fbf8e9139e4eadf191102cffd29617/Screen_Shot_2016-03-17_at_12.23.03_PM.png)

Reverts !3147

See merge request !3276
2016-03-17 20:09:40 +00:00
Robert Speicher 1525885648 Merge branch 'hide-builds-feature' into 'master'
Hide builds from Project's settings when the feature is disabled

Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/13944

See merge request !3220
2016-03-17 19:49:48 +00:00
Robert Speicher 9f72d3ed79 Merge branch 'caching-project-avatars' into 'master'
Cache project avatars stored in Git

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/14363

See merge request !3272
2016-03-17 18:26:48 +00:00
Jacob Vosmaer d123b8ad5d Merge branch 'artem-forks/gitlab-ce-nginx-rel-url' 2016-03-17 18:53:43 +01:00
Yorick Peterse cd05d3f78d Cache project avatars stored in Git
The avatar logic has been moved from Project to Repository as this makes
caching easier. The logic itself in turn has been changed so that the
logo file names are cached in Redis. This cache is flushed upon pushing
a commit but _only_ if:

1. The commit was pushed to the default branch
2. The commit actually changes any of the logo files

If no branch or commit is given the cache is flushed anyway, this
ensures that calling Repository#expire_cache without any arguments still
flushes the avatar cache (e.g. this is used when removing a project).

Fixes gitlab-org/gitlab-ce#14363
2016-03-17 18:51:54 +01:00
Alfredo Sumaran 028c751040 Revert link color from blue 2016-03-17 12:20:24 -05:00
Dmitriy Zaporozhets 5ae95b1880 Add space to separate different files in diff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-17 18:11:42 +01:00
Robert Speicher d1fd2cb8c1 Merge branch 'dropdown-preselect-value' into 'master'
Pre-selects values on issue and merge request dropdown

Closes #14290

See merge request !3233
2016-03-17 16:56:34 +00:00
Dmitriy Zaporozhets 21952cc7f1 Add side padding to content-list if inside panel
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-17 17:29:09 +01:00
Kamil Trzciński f728e4b519 Merge branch 'glalonde-triggerbuild' into 'master'
Adjusted behavior so canceled builds tagged as allowed to fail do not fail build

## What does this MR do?
This diff changes the 'Allowed to fail' flag to also ignore canceled builds, whereas before, canceled builds could fail the suite even if they were marked as 'Allowed to fail'

dupe of !3258 to force a build

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

## Why was this MR needed?
Unexpected behavior as a user

## What are the relevant issue numbers?

## Screenshots (if relevant)
![whatisgoingon](/uploads/fcd7c8f3d8454bc730d7fd41eff59b31/whatisgoingon.png)

See merge request !3271
2016-03-17 15:51:11 +00:00
Phil Hughes ceaa694391 Fixed failing tests 2016-03-17 15:10:45 +00:00
Geoffrey Lalonde 573c8d561f added changelog entry 2016-03-17 07:58:32 -07:00
Geoffrey Lalonde 4117c815df adjusted behavior so canceled builds tagged as allowed to fail do not fail build 2016-03-17 07:55:10 -07:00
Achilleas Pipinellis 9392e1375c Merge branch 'rm_duplicate_cache_ci_docs' into 'master'
Merge duplicate cache entry in CI docs



See merge request !3208
2016-03-17 14:32:22 +00:00
Douwe Maan 69e966d9a5 Merge branch 'patch/refactor-post-receive' into 'master'
PostReceive refactor

Back-ported PostReceive refactor made for https://gitlab.com/gitlab-org/gitlab-ee/issues/367 in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/267

See merge request !3264
2016-03-17 14:16:55 +00:00
Douwe Maan 21af7459ab Merge branch '4009-external-users' into 'master'
External Users

The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.

Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users)


![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png)

See merge request !3171
2016-03-17 14:15:38 +00:00
Douwe Maan cf2e3ff6f9 Merge branch 'new-branch-button-issue' into 'master'
New branch button on issues

Creates a button which creates a branch for you, referencing the original issue in the branch name. When creating the MR the text `Closes #iid` is appended to the description field.

The button; with styling

![Screenshot_from_2016-02-13_17-28-54](/uploads/9595fbfef88c10a499829beaa3db11c1/Screenshot_from_2016-02-13_17-28-54.png)

Links to the related branches on the issue

![Screenshot_from_2016-02-13_17-31-48](/uploads/ee7a78754eb5e2389f8671771bb59af9/Screenshot_from_2016-02-13_17-31-48.png)

Styled like the MR links

![Screenshot_from_2016-02-13_17-31-53](/uploads/c60130333a650a16f51b014aeb1458c3/Screenshot_from_2016-02-13_17-31-53.png)


Please provide input on the following; the CI repo on the GDK had the following happening with the current way I implemented the matching:

![Screenshot_from_2016-02-14_08-57-19](/uploads/35e7a3687a0fa801aba1ad66305ab2ff/Screenshot_from_2016-02-14_08-57-19.png)

Closes #3886 

cc @DouweM 


See merge request !2808
2016-03-17 14:14:32 +00:00
Achilleas Pipinellis 5b1db58c85 Merge branch 'master' into rm_duplicate_cache_ci_docs 2016-03-17 15:56:44 +02:00
Jacob Schatz 4874c549c6 Merge branch 'fix_horizontal_overflow_in_code_tag' into 'master'
Fix horizontal overflow that occurs in the code tag

closes #14167 

### Before Fix
![Screen_Shot_2016-03-16_at_9.10.52_PM](/uploads/b4a282ffc33684983d7e2482b8e13a8f/Screen_Shot_2016-03-16_at_9.10.52_PM.png)

### After Fix
![Screen_Shot_2016-03-16_at_9.11.16_PM](/uploads/8acca3b46bfdbd929cc096ad070022e2/Screen_Shot_2016-03-16_at_9.11.16_PM.png)


See merge request !3255
2016-03-17 13:54:18 +00:00
Jacob Schatz 5e7622d2dc Merge branch 'css-space-after-colon' into 'master'
Follow the CSS Style Guide rules for including a space after the property colon.

Fixes violations of SpaceAfterPropertyColon.

Discussed in #14299.

[ci skip]

cc: @rspeicher @jschatz1 

See merge request !3260
2016-03-17 13:26:13 +00:00
Jacob Schatz 4b5e06a944 Added comment to make builds run 2016-03-17 09:18:16 -04:00
Phil Hughes 41c107becc Mark all as done through AJAX 2016-03-17 13:08:59 +00:00