Commit Graph
29035 Commits
Author SHA1 Message Date
Grzegorz Bizon 5ef104df59 Improve Ci config loader by changing method signature 2016-06-07 12:53:46 +02:00
Grzegorz Bizon fa097c678c Remove duplicated exception in Ci config
This is a temporary refactoring stub, that is planned to be removed
after removing legacy config processor.
2016-06-07 10:26:38 +02:00
Grzegorz Bizon 23030439c2 Rename class that loads CI configuration to Loader 2016-06-06 08:20:55 +02:00
Grzegorz Bizon d2b708ac43 Extract CI config YAML parser to a separate class
With this approach it would be easier to add different sources of
configuration, that we do not necessairly have to be in YAML format.
2016-06-03 21:10:50 +02:00
Grzegorz Bizon d501850e05 Add gitlab ci configuration class that holds hash
As for now, we keep this class inside a oryginal config processor class.
We will move implementation to this class and delegate to it from
current config processor.

After original gitlab ci yaml processor not longer has relevant
impelemntation we will replace it with new configuration class.
2016-06-03 14:20:34 +02:00
Dmitriy Zaporozhets 3f4ac2ff60 Merge branch 'dz-code-tab'
See merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4431
2016-06-03 11:42:02 +03:00
Dmitriy Zaporozhets 334cb86821 Update test since branch removal does not render template anymore
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-03 10:13:40 +03:00
Dmitriy Zaporozhets db2109b086 Fix more tests with new Code tab
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-03 10:13:40 +03:00
Dmitriy Zaporozhets 7cfb445c15 Update tests to match new Code tab logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-03 10:13:40 +03:00
Dmitriy Zaporozhets 56a17a7701 Put project Files and Commits tabs under Code tab
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-03 10:13:40 +03:00
Dmitriy Zaporozhets ae5f17ae2d Merge branch 'dz-more-ui-guides' into 'master'
Add icons and buttons to UI guide

cc @jschatz1 @skyruler 

See merge request !4445
2016-06-03 07:07:52 +00:00
Robert Speicher 07b46517cc Merge branch 'fix/import-error-handling' into 'master'
Fix import error handling

Fixes https://gitlab.com/gitlab-com/support-forum/issues/745

This improves import error handling:
- Now if there's an error during importing before the job is scheduled, we also mark the project status as failed.
- Refactored setting the status to failed into one single method.
- Fixed some situations where the error message was missing or simply empty.

See merge request !4366
2016-06-03 03:00:07 +00:00
James LopezandRobert Speicher c9e8acd058 Update repository_import_worker.rb 2016-06-02 21:48:27 -04:00
James LopezandRobert Speicher d9df05e143 fix import service spec 2016-06-02 21:48:27 -04:00
James LopezandRobert Speicher f2ec6341b3 added changelog 2016-06-02 21:48:27 -04:00
James LopezandRobert Speicher 097eafc8c7 fix some issues and improved error output for forking 2016-06-02 21:48:26 -04:00
James LopezandRobert Speicher 64c3905523 some refactoring and fixing spec 2016-06-02 21:48:25 -04:00
James LopezandRobert Speicher b2b3e0e6ee fix empty message on shell error 2016-06-02 21:47:39 -04:00
James LopezandRobert Speicher b2b2b2f9de fix create service error handling - missing setting import status to failed 2016-06-02 21:47:38 -04:00
Yorick Peterse 74849f9783 Merge branch '18031-sidebar-labels-queries' into 'master'
See merge request !4436
2016-06-02 20:58:57 +00:00
Dmitriy Zaporozhets 94b0da4230 Merge branch 'rs-todo-has-tooltip' into 'master'
Add tooltips to todo target links



See merge request !4370
2016-06-02 20:20:18 +00:00
Dmitriy Zaporozhets 814b26cfc3 Fix typo
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-02 23:04:08 +03:00
Dmitriy Zaporozhets 33c499441a Add icons and buttons to UI guide
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-02 22:43:02 +03:00
Paco Guzman 078ba8c090 issuable#labels_array explicitly load the labels
This will be useful when you want to ask for the 
number of items and later iterate over them, without 
needing to ask if the association is load or not.

So you avoid extra database queries
2016-06-02 21:43:01 +02:00
Robert Speicher ab75b21c83 Update CHANGELOG for 8.8.3
[ci skip]
2016-06-02 13:59:34 -04:00
Robert Speicher 7deb21b626 Merge branch 'issue_18102' into 'master'
Fixes missing number on generated ordered list

Closes #18102 

See merge request !4437
2016-06-02 17:15:26 +00:00
Robert Speicher e6389dfee6 Merge branch 'reduce-fog-deps' into 'master'
Reduce number of fog gem dependencies

Currently supported:

* AWS
* Azure
* OpenStack
* Google
* local storage

Closes #15352

See merge request !4396
2016-06-02 16:35:42 +00:00
Yorick Peterse 61cfda255f Merge branch 'issue-18032' into 'master'
Cache project build count. Closes #18032

See merge request !4377
2016-06-02 16:21:49 +00:00
Robert Speicher f0d6d71117 Merge branch 'tests/move-shortcuts-specs-to-valid-directory' into 'master'
Move feature specs for shortcuts to valid directory

This MR moves tests to valid directory that matches our namespace we use in code.

See merge request !4433
2016-06-02 15:43:13 +00:00
Josh Frye 2605a0a844 Refactor. Add tests. 2016-06-02 11:10:57 -04:00
Josh Frye 4d9622e7d3 Invalidate cache on build change 2016-06-02 11:10:57 -04:00
Josh Frye 2d05de7af8 Cache project build count. Closes #18032 2016-06-02 11:10:57 -04:00
Yorick Peterse 81621e46e7 Merge branch 'issue-18036' into 'master'
Cache assigned issue and merge request count. Closes #18036 and #18035

See merge request !4378
2016-06-02 15:01:50 +00:00
Jacob Schatz 879a2f8148 Merge branch 'search-box-blur' into 'master'
Clicking search pill focuses field

When clicking the pill in the search field, it now focus the field. Previously you would have to make sure you click in the field.

Fixed an issue where clicking out of the field wouldn't remove the focus
outline

Also reduced some of the HTML to remove what isn't needed

See merge request !4279
2016-06-02 14:57:50 +00:00
Alfredo Sumaran c966d55e6a Fixes missing number on generated ordered list 2016-06-02 09:36:09 -05:00
Stan Hu 5accd87ad7 Merge branch 'fix-inline-filter-speed' into 'master'
Fix serious performance bug with rendering Markdown with InlineDiffFilter

Nokogiri's `node.replace` was being unnecessarily called for every text node in
the document due to a comparison bug. The code previously was comparing the
HTML representation of the full document against the text node, which would
always fail. Fix the comparison to just compare the modified text.

Closes #18011 


See merge request !4392
2016-06-02 13:56:24 +00:00
Josh Frye 0f3df62e1a Update specs. Add CHANGELOG entry 2016-06-02 09:25:40 -04:00
Josh Frye 8835b7889a Flush cache in callback. Add tests 2016-06-02 09:13:59 -04:00
Josh Frye bfccea3703 Cache assigned open issue count. Closes #18035 2016-06-02 09:13:59 -04:00
Josh Frye bffe0d6325 Cache assigned merge request count. Closes #18036 2016-06-02 09:13:59 -04:00
Rémy Coutable f828b74483 Merge branch '14446-no_group_avatar-png-link' into 'master'
Fix link to blank group icon

When the group is the default blank icon, this needs to use the
`image_path` helper; otherwise, the link won't work if assets are
precompiled. This still works fine for uploaded icons in either case.

Closes #14446.

See merge request !4375
2016-06-02 11:29:33 +00:00
Rémy Coutable 8d23e87242 Merge branch 'chujinjin/gitlab-ce-fix_wiki_project_clone_address_error' into 'master'
Fix wiki project clone address error

_Note: Originally opened at !4407 by @chujinjin._

---

fix wiki project clone address error in Wiki Git Access View, show as below:

![image](/uploads/5e3bf6d1418c42862a885319c31bc3cf/image.png)

Fixes #17643.

See merge request !4429
2016-06-02 11:27:36 +00:00
Sean McGivern 1521dc51e9 Fix link to blank group icon
When the group is the default blank icon, this needs to use the
`image_path` helper; otherwise, the link won't work if assets are
precompiled. This still works fine for uploaded icons in either case.
2016-06-02 11:19:27 +01:00
Achilleas Pipinellis acfbeced52 Merge branch 'minor_doc_updates' into 'master'
Minor doc updates

## What does this MR do?

Adds to and clarifies some documentation. Specifically, when using `gdb` to debug you need to detach and exit when done. Next, this clarifies the type of file locking that we require.

Thanks to @northrup for the details about mandatory vs. advisory file locking.

Note: These were two really small changes so I combined in to one merge request. However, I left the commits separate for clarity.

See merge request !4421
2016-06-02 09:10:04 +00:00
Grzegorz Bizon 1abb0ed97d Move feature specs for shortcuts to valid directory 2016-06-02 11:05:54 +02:00
chujinjinandRémy Coutable c102b03e76 Fix wiki project clone address error 2016-06-02 09:46:26 +02:00
Stan Hu ad3d0585aa Fix serious performance bug with rendering Markdown with InlineDiffFilter
Nokogiri's `node.replace` was being unnecessarily called for every text node in
the document due to a comparison bug. The code previously was comparing the
HTML representation of the full document against the text node, which would
always fail. Fix the comparison to just compare the modified text.

Closes #18011
2016-06-01 21:56:27 -07:00
Robert Speicher 30524901e2 Merge branch 'cs-unnecessary-assets' into 'master'
Load d3 only when necessary

Now d3 is only loaded on the users' show page and the graphs pages, where it's necessary.

Redo of !3993.

This decreases page size from 4.6MB to 4.3MB for a given Activity page (before compression), or a savings of 300KB. This is essentially a proof of concept for removing larger dependencies such as the Ace Editor, Chart.js, and Raphael, which will likely provide another 1MB of savings on most pages (again, before compression).

See merge request !4394
2016-06-02 02:49:44 +00:00
Robert Speicher 34861c5f2b Merge branch 'cleanup-readme' into 'master'
Remove Coveralls and Semaphore badges. [ci skip]

Remove Coveralls and Semaphore badges from the README. They're outdated,
unused, and not GitLab CI :)

[ci skip]

See merge request !4334
2016-06-02 02:10:40 +00:00
Connor Shea 586d1a9b24 Move JS graph specs to match assets tree. 2016-06-01 19:48:01 -06:00