Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-17Merge branch 'restrict-user-api-integers' into 'master'Dmitriy Zaporozhets
Restrict users API endpoints to use integer IDs Closes #2267 See merge request !1156
2015-09-17Fix HTML link that was improperly escaped in new user e-mailStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9640
2015-09-16Merge branch 'ldap-attributes' into 'master'Robert Speicher
Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
2015-09-16Fix broken sort in merge request APIStan Hu
Closes #2266
2015-09-16Sorted autocomplete users list by nameAllister Antosik
2015-09-15Merge pull request #9138 from liyakun/masterStan Hu
add "replace" and "upload" functionality
2015-09-15 Add "Replace" and "Upload" featuresliyakun
Refactor upload and replace functionality Rename file and move CSS Fix typo Make dropzone a div Remove unnecessary file Change color of "upload existing one" Add missing changes
2015-09-14Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets
Make all group public https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219# Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361 See merge request !1247
2015-09-11Import forked repositories asynchronously to prevent large repositories from ↵Stan Hu
timing out Use import_status to track async import status and give feedback to the user Closes #2388 Closes #2400
2015-09-11Merge branch 'fix-rouge-warning-noise' into 'master'Robert Schilling
Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs rouge warnings begone! Closes #2128 Closes #2433 See merge request !1277
2015-09-10Bump rouge to 1.10.1Stan Hu
2015-09-10Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting ↵Stan Hu
bugs Closes #2128 Closes #2433
2015-09-10Fix some CHANGELOG entriesStan Hu
2015-09-10Add missing 7.14.x CHANGELOG entriesRobert Speicher
2015-09-10Merge branch 'rescue-syntax-highlighting-errors' into 'master'Robert Schilling
Gracefully handle errors in syntax highlighting by leaving the block unformatted A bug in Rouge caused an Exception: ```undefined method `sub' for :Literal:Symbol``` That caused https://gitlab.com/embeddable-common-lisp/ecl/issues/156 to hit Error 500 and fail to display. If a failure occurs, just render the text as preformatted. Closes #2433 See merge request !1274
2015-09-10Added service API endpoint to retrieve service parametersPetheo Bence
2015-09-10Gracefully handle errors in syntax highlighting by leaving the block unformattedStan Hu
Closes #2433
2015-09-09Merge branch 'rouge-patch' into 'master'Robert Speicher
Fix highlighting of deleted lines in diffs. Resolves internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2498 Only needed until https://github.com/jneen/rouge/pull/297 is merged into Rouge and the gem is updated in GitLab. Forking `rouge`, releasing `gitlab-rouge` and using that gem wasn't an option, since `gollum-lib` has `rouge` as a dependency, so it would get included anyway, and which code we'd get would depend on the load order. See merge request !1267
2015-09-09Merge branch 'issue-1952' into 'master'Kamil Trzciński
Fixed #1952 docker ssh connection times can be slow when UseDNS is enabled See merge request !1208
2015-09-09Merge branch 'fix-emojis-relative-url' into 'master'Douwe Maan
Fix emoji URLs in Markdown when relative_url_root is used Path/URL helpers (e.g. `asset_url_helper`) already include the relative_url_root, so there is no need to attach it twice. Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example: RELATIVE_URL_ROOT=/gitlab rspec Closes #1728 See merge request !1254
2015-09-09Fix highlighting of deleted lines in diffs.Douwe Maan
2015-09-09Add to changelogDouwe Maan
2015-09-09Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets
Global labels https://dev.gitlab.org/gitlab/gitlabhq/issues/2353 See merge request !1240
2015-09-09Make all group publicValery Sizov
2015-09-09FogBugz project importJared Szechy
2015-09-07Merge branch 'crowd' into 'master'Valery Sizov
Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
2015-09-07Merge branch 'url-builder-fix-for-relative-urls' into 'master'Dmitriy Zaporozhets
Fix URL construction for merge requests, issues, notes, and commits for relative URL config This MR fixes the constructor of URL links for systems using relative URLs in the application config. The `host` parameter was used improperly, supplying an extra path (e.g. https://mydomain.com/gitlab) and unnecessary scheme. We should be able to default to the URL options set in `8_default_url_options.rb` file. Closes https://github.com/gitlabhq/gitlabhq/issues/9605 See merge request !1250
2015-09-07Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan
Fix broken Wiki Page History This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes. Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399 See merge request !1232
2015-09-06Fix emoji URLs in Markdown when relative_url_root is usedStan Hu
Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example: RELATIVE_URL_ROOT=/gitlab rspec Closes #1728
2015-09-05Fix URL construction for merge requests, issues, notes, and commits for ↵Stan Hu
relative URL config Closes https://github.com/gitlabhq/gitlabhq/issues/9605
2015-09-04add Content-Type header of raw image filepilsner
Add Content-Type header to fix a bug which IE can't show image in markdown when the image is from raw. modified: CHANGELOG modified: app/controllers/projects/raw_controller.rb modified: spec/controllers/projects/raw_controller_spec.rb
2015-09-03Create labels in new projectValery Sizov
2015-09-03Add API method for get user by ID of an SSH keyArtem V. Navrotskiy
2015-09-02Fix tests and update CHANGELOGDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02Merge branch 'fix-raw-controller-disposition' into 'master'Dmitriy Zaporozhets
Remove the filename argument from Content-Disposition header This MR removes the filename argument from the `Content-Disposition` header to avoid RFC 5987 and RFC 6266 encoding issues. Some browsers (e.g. Internet Explorer) do not properly decode a Unicode string properly, and this can lead to odd filenames in the raw file download. This change allows the browser to determine the filename based on the URL. For example, if I have a file called `한글한글.pptx` and click to download it with the "Raw" button in the Files section, IE11 will ask: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/fdb688282c0d4564872deadb44c58b2c/image.png) If you look at the `Content-Disposition` field, you see this: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2b342b83ae1ec61fd31937163ace8ec5/image.png) Chrome, Firefox, and Safari seem to be able to handle UTF-8 encoded filenames, even though this is not standard. See: http://greenbytes.de/tech/tc2231/ Closes https://github.com/gitlabhq/gitlabhq/issues/9595 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829 I've also submitted a pull request to Rails to support RFC 6266: https://github.com/rails/rails/pull/21461 See merge request !1235
2015-09-02Crowd integrationValery Sizov
2015-09-02Remove the filename argument from Content-Disposition header to avoidStan Hu
RFC 5987 and RFC 6266 encoding issues. This change allows the browser to determine the filename based on the URL. See: http://greenbytes.de/tech/tc2231/ Closes https://github.com/gitlabhq/gitlabhq/issues/9595 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829
2015-09-02Fix broken Wiki Page HistoryStan Hu
Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399
2015-09-02Drone CI serviceKirilll Zaitsev
2015-09-02Merge branch 'use_db_for_application_settings' into 'master'Marin Jankovski
Check if database connection exists when loading application settings !1217 broke omnibus-gitlab nightly builds. In omnibus-gitlab we precompile assets without a running database. See merge request !1230
2015-09-01Merge branch 'fix-bitbucket-import-issue-order' into 'master'Douwe Maan
Import all Bitbucket issues and sort issues by creation date Previously only the first 15 Bitbucket issues would be imported. Other issues in the API return call also calls import errors. Tested by importing 400+ issues from this repo: https://bitbucket.org/ned/coveragepy API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518 Closes https://github.com/gitlabhq/gitlabhq/issues/9519 See merge request !1226
2015-09-01Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu
Also fix a number of issues where author/reporter names were not available.
2015-09-01Added USE_DB env var to allow loading fake settings without db running.Marin Jankovski
2015-09-01Sort issues by creation date in Bitbucket importerStan Hu
API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518 Closes https://github.com/gitlabhq/gitlabhq/issues/9519
2015-09-01Merge branch 'oauth_token_with_ldap' into 'master'Dmitriy Zaporozhets
Retrieving oauth token with LDAP credentials https://dev.gitlab.org/gitlab/gitlabhq/issues/2529 See merge request !1220
2015-08-31Merge branch 'fix-headers-blocking-anchors' into 'master'Dmitriy Zaporozhets
Prevent anchors from being hidden by header upon a new page load Browsers change the scroll position after the page is loaded, and the current 1 ms delay wasn't long enough for the browser to jump to the anchor. Even then, it appears another 100ms delay is necessary to adjust the scroll properly: http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict Add a little more of an offset to see a few lines before the anchor. * Closes #1614 * Closes #1024 See merge request !1225
2015-08-31retrieving oauth token with LDAP credentialsValery Sizov
2015-08-31Merge branch 'dont-notify-users-without-project-access' into 'master'Robert Speicher
Don't notify users without access to the project when they are (accidentally) mentioned in a note. Addresses #2366. See merge request !1216
2015-08-29Move changelog itemDouwe Maan
2015-08-29Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan