home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,206 Commits 48 Branches 340 Tags
468dbfe937b60cc0b06f062fd01dcfd70450bcf1
Commit Graph
23206 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcin Zajączkowski 468dbfe937 Update Slack integration configuration 2016-01-25 13:06:09 +00:00
Valery Sizov 0f13933175 Merge branch 'rails_update' into 'master' 
Rails updated to 4.2.5

I hope it'll fix weird spec failing (according to https://github.com/rails/rails/pull/22383)

@dzaporozhets @yorickpeterse 

See merge request !2591
 2016-01-25 11:11:02 +00:00
Kamil Trzciński b6600debd0 Merge branch 'install-unzip' into 'master' 
Install unzip in build environment [ci skip]



See merge request !2593
 2016-01-25 09:59:53 +00:00
Kamil Trzcinski 25bde645d8 Install unzip in build environment [ci skip] 2016-01-25 10:59:01 +01:00
Douwe Maan 0f2a906211 Merge branch 'update-gitlab-git' into 'master' 
Update gitlab_git & use new method for counting branches

Corresponding gitlab_git merge request detailing some of the rationale behind this: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/62

Fixes #12418 

See merge request !2535
 2016-01-25 09:35:54 +00:00
Valery Sizov 4cfa119d5b rails updated to 4.2.5 2016-01-25 11:13:40 +02:00
Achilleas Pipinellis 07ee83932f Merge branch 'doc_artifacts' into 'master' 
Add note on artifacts browser functionality

Based on the following comment:
https://gitlab.com/gitlab-org/gitlab-ce/issues/12634#note_3359006

See merge request !2586
 2016-01-24 21:53:17 +00:00
Achilleas Pipinellis 5c69560a2d Add note on artifacts browser functionality 
Based on the following comment:
https://gitlab.com/gitlab-org/gitlab-ce/issues/12634#note_3359006

[ci skip]
 2016-01-24 22:49:37 +01:00
Achilleas Pipinellis e9eece1d44 Merge branch 'doc_omniauth' into 'master' 
Move supported omniauth providers to the top



See merge request !2585
 2016-01-24 20:39:54 +00:00
Achilleas Pipinellis 040fb46dc7 Move supported omniauth providers to the top 
[ci skip]
 2016-01-24 21:38:39 +01:00
Achilleas Pipinellis c3cc63beb6 Merge branch 'doc_integration_imgs' into 'master' 
Move all integration docs images in a single directory



See merge request !2584
 2016-01-24 20:28:08 +00:00
Achilleas Pipinellis 6f615500a9 Move all integration docs images in a single directory 
[ci skip]
 2016-01-24 21:22:19 +01:00
Achilleas Pipinellis 97b2d78de8 Merge branch 'doc_refactor_system_hooks_api' into 'master' 
Refactor system_hooks API documentation



See merge request !2475
 2016-01-24 19:24:46 +00:00
Achilleas Pipinellis df4d676811 Merge branch 'doc_refactor_namespaces_api' into 'master' 
Refactor namespaces API documentation



See merge request !2472
 2016-01-24 19:23:56 +00:00
Achilleas Pipinellis 28c14ceaa2 Merge branch 'doc_refactor_README_api' into 'master' 
Refactor README API documentation

~~Waiting for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2435 to be merged.~~

See merge request !2476
 2016-01-24 19:22:42 +00:00
Achilleas Pipinellis 23a878c40c Clean up system hooks API documentation 
[ci skip]
 2016-01-24 20:20:39 +01:00
Achilleas Pipinellis 4ae7cb9a93 Merge branch 'doc_refactor_settings_api' into 'master' 
Refactor settings API documentation



See merge request !2474
 2016-01-24 18:36:51 +00:00
Achilleas Pipinellis 2b3e64a601 Clean up namespaces API documentation 
[ci skip]
 2016-01-24 19:28:24 +01:00
Achilleas Pipinellis 6cab2e4076 Merge branch 'doc_refactor_labels_api' into 'master' 
Refactor labels API documentation



See merge request !2471
 2016-01-24 16:53:46 +00:00
Achilleas Pipinellis ebaedca907 Merge branch 'doc_refactor_issues_api' into 'master' 
Refactor issues API documentation



See merge request !2466
 2016-01-24 16:40:50 +00:00
Achilleas Pipinellis 9f095bbbcc Merge branch 'doc_refactor_deploy_keys_api' into 'master' 
Refactor deploy_keys API documentation



See merge request !2467
 2016-01-24 16:39:39 +00:00
Achilleas Pipinellis 82e352d0b4 Merge branch 'doc_refactor_branches_api' into 'master' 
Refactor branches API documentation



See merge request !2464
 2016-01-24 16:38:43 +00:00
Robert Speicher d668266306 Merge branch 'rs-no-minified-js' 
Don't vendor minified JS

Fixes #4031

See merge request !2494
 2016-01-23 17:45:39 -08:00
Robert Speicher 5409fc49bd Merge branch 'raw_abbr' into 'master' 
Whitelist raw "abbr" elements when parsing Markdown

See #12517.

See merge request !2559
 2016-01-23 22:10:08 +00:00
Kamil Trzciński 3ef59c8de0 Merge branch 'forcefully-install-apt-packages' into 'master' 
Forcefully install apt packages



See merge request !2577
 2016-01-23 21:08:41 +00:00
Kamil Trzcinski 2c28c11df5 Forcefully install apt packages 2016-01-23 21:29:43 +01:00
Benedict Etzel 6435f78a8c Whitelist raw "abbr" elements when parsing Markdown 
Closes #12517
 2016-01-23 20:38:06 +01:00
Dmitriy Zaporozhets dc78ee4e8b Merge branch 'ignore-binary-files-in-git-grep' into 'master' 
Ignore binary files in code search to prevent Error 500

Leaving out the -I option in "git grep" would cause an Error 500 because the
resulting line would include "Binary file X matches", which would cause the project search results to crash with the following error:

```
ActionView::Template::Error (wrong argument type nil (expected Regexp)):
    1: - blob = @project.repository.parse_search_result(blob)
    2: .blob-result
    3:   .file-holder
    4:     .file-title
  app/models/repository.rb:742:in `sub'
  app/models/repository.rb:742:in `block in parse_search_result_from_grep'
  app/models/repository.rb:741:in `each_line'
  app/models/repository.rb:741:in `parse_search_result_from_grep'
  app/models/repository.rb:682:in `parse_search_result'
  app/views/search/results/_blob.html.haml:1:in `_app_views_search_results__blob_html_haml__1959871337755590783_162450160'
  app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__2198486911700532411_58329920'
  app/views/search/show.html.haml:7:in `_app_views_search_show_html_haml___1698304427272645201_62235300'
```

See merge request !2565
 2016-01-23 18:11:08 +00:00
Achilleas Pipinellis fb3e1026e8 Merge branch 'housekeeping_doc' into 'master' 
Make git gc man page more apparent



See merge request !2557
 2016-01-23 11:19:27 +00:00
Jacob Schatz 0ee2d50eee Merge branch 'issuable-white-bg' into 'master' 
Remove gray background from issue/mr/milestone background

Fixes #6062 

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

See merge request !2573
 2016-01-23 05:41:00 +00:00
Jacob Schatz dfc7bfd3e3 Merge branch 'fix-ui-padding' into 'master' 
Fix UI for pages with panels

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

cc @skyruler @creamzy 

Fixes #12633 

See merge request !2571
 2016-01-23 05:20:33 +00:00
Dmitriy Zaporozhets 367cd8ac75 Remove gray background from issue/mr/milestone background 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-22 16:15:32 -08:00
Achilleas Pipinellis d9cb41daa5 Merge branch 'patch-1' into 'master' 
Minor spelling, prob typo



See merge request !2564
 2016-01-22 21:42:57 +00:00
Achilleas Pipinellis 59e469572e Merge branch 'name-azure-in-general-readme' into 'master' 
Name more OmniAuth providers in the general readme.



See merge request !2566
 2016-01-22 21:42:04 +00:00
Dmitriy Zaporozhets cf673ba9f6 Fix UI for pages with panels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-22 13:37:40 -08:00
Robert Speicher 3fbdc6368a Merge branch 'dont-use-prod-namespace' into 'master' 
Don't use production section for Gemfile

Related to !2485

See merge request !2570
 2016-01-22 21:35:36 +00:00
Dmitriy Zaporozhets 892844c532 Don't use production section for Gemfile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-22 13:04:22 -08:00
Kamil Trzciński 1ef0ac505c Merge branch 'speed-up-builds' into 'master' 
Speed-up docker based builds

This adds:
- Bundler cache
- APT cache
- PhantomJS cache

It should reduce the time needed for container to prepare docker-based build environment.


See merge request !2567
 2016-01-22 20:16:55 +00:00
Dmitriy Zaporozhets b0fff566c9 Merge branch 'issue_2239' into 'master' 
Provide a link for fetching merge requests from command line instructions

Closes #2239 

See merge request !2540
 2016-01-22 20:00:34 +00:00
Robert Speicher 06158a0ac5 Merge branch 'solarized-dark-old-lines' into 'master' 
Make deleted line background color for Solarized Dark a little darker

The difference is very slight, and I don't even _use_ Solarized Dark, but this annoyed me.

See merge request !2563
 2016-01-22 19:46:07 +00:00
Dmitriy Zaporozhets 3982219d98 Merge branch 'es_backport' into 'master' 
Backport some changes from EE



See merge request !2548
 2016-01-22 18:23:02 +00:00
Dmitriy Zaporozhets bed4f43f1a Fix changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-22 10:20:39 -08:00
Dmitriy Zaporozhets 56b527093d Merge branch 'fix-comment-on-diff-ajax-loading' 2016-01-22 10:20:19 -08:00
Dmitriy Zaporozhets 406c912496 Merge branch 'fix-error-500-mr-search' into 'master' 
Fix Error 500 when doing a search for merge requests

Potential fix for #11547

See merge request !2525
 2016-01-22 18:14:10 +00:00
Kamil Trzcinski edf93ecb6e Speed-up docker based builds 
Enable to:
- Use APT cache
- Use Bundler cache
- Use PhantomJS cache
 2016-01-22 19:09:22 +01:00
Sytse Sijbrandij fd00646b5b Name more OmniAuth providers in the general readme. 2016-01-22 08:57:29 -08:00
Stan Hu 5972dedfcf Ignore binary files in code search to prevent Error 500 
Leaving out the -I option in "git grep" would cause an Error 500 because the
resulting line would include "Binary file X matches"
 2016-01-22 08:17:54 -08:00
Mark Nordine 831bb04db7 Minor spelling, prob typo 2016-01-22 16:04:08 +00:00
Kamil Trzciński 0e51ca7c48 Merge branch 'mysql-password-ci' into 'master' 
Allow empty Mysql password on CI

[ci skip]

See merge request !2558
 2016-01-22 15:40:56 +00:00
Douwe Maan db7d1dbe54 Make old line background color for Solarized Dark a little more clear 2016-01-22 16:07:24 +01:00