summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump rouge to 1.10.1Stan Hu2015-09-103-27/+3
|
* Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting ↵Stan Hu2015-09-102-2/+3
| | | | | | | | bugs Closes #2128 Closes #2433
* Merge branch 'rs-changelog' into 'master'Robert Speicher2015-09-101-3/+8
|\ | | | | | | | | | | | | | | Add missing 7.14.x CHANGELOG entries [ci skip] See merge request !1275
| * Add missing 7.14.x CHANGELOG entriesRobert Speicher2015-09-101-3/+8
|/
* Merge branch 'rescue-syntax-highlighting-errors' into 'master'Robert Schilling2015-09-103-1/+28
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Gracefully handle errors in syntax highlighting by leaving the block unformattedStan Hu2015-09-103-1/+28
| | | | | | | | Closes #2433
* | Merge pull request #9604 from ↵Stan Hu2015-09-105-0/+190
|\ \ | |/ |/| | | | | bpetheo/bpetheo_add_service_api_endpoint_to_retrive_service_parameters Added service API endpoint to retrieve service parameters
| * Added service API endpoint to retrieve service parametersPetheo Bence2015-09-105-0/+190
|/
* Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-1010-80/+77
|\ | | | | | | | | | | | | | | | | | | | | | | UI improvements * Convert forked from button to text * Refactor md variables * Improve project fork page * Style blob show page * Style syntax highlight area for white theme See merge request !1273
| * Style syntax highlight area for white themeui-improvementsDmitriy Zaporozhets2015-09-103-34/+36
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Style blob show pageDmitriy Zaporozhets2015-09-104-10/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Improve project fork pageDmitriy Zaporozhets2015-09-102-27/+20
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Refactor md variablesDmitriy Zaporozhets2015-09-102-2/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Conver forked from button to textDmitriy Zaporozhets2015-09-102-7/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'disable-issue-autofill' into 'master'Dmitriy Zaporozhets2015-09-101-1/+1
|\ \ | | | | | | | | | | | | | | | Turned off autocomplete for new issue titles See merge request !1271
| * | Turned off autocomplete for new issue titlesdisable-issue-autofillDarby2015-09-091-1/+1
| | |
* | | Merge branch 'fix-semaphore-twitter-identity-issue' into 'master'Dmitriy Zaporozhets2015-09-101-2/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update OmniAuth test to pass in Semaphore This has caused all the build failures on GitHub master for the last few days. This change seems to pass Semaphore build on GitHub: https://semaphoreci.com/stanhu/gitlabhq/branches/fix-semaphore-twitter-identity-issue-try2 Closes #2469 See merge request !1272
| * | Fix testStan Hu2015-09-101-2/+4
| | |
* | | Fix fixed layoutDmitriy Zaporozhets2015-09-101-1/+1
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #9617 from dukex/patch-1Robert Speicher2015-09-091-1/+1
|\ \ | | | | | | | | | | | | Fix 7.14 stable branch name in upgrade docs [ci skip]
| * | fix 7.14 stable branch nameDuke2015-09-091-1/+1
|/ /
* | Improve accounts page UIDmitriy Zaporozhets2015-09-101-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-099-15/+62
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Ui improvements * allow containers without bg and border * style twbs panels See merge request !1270
| * | Fix last element of sidebar being hidden for small screensDmitriy Zaporozhets2015-09-091-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Enable blank container for group settings pageDmitriy Zaporozhets2015-09-092-3/+8
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Style panels and add blank containerDmitriy Zaporozhets2015-09-098-13/+55
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'nav-improvements' into 'master'Dmitriy Zaporozhets2015-09-0914-54/+53
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | Profile settings navigation improvements * separate profile settings link * get rid of double titles on profile page See merge request !1269
| * Use page title for header title tooDmitriy Zaporozhets2015-09-0913-49/+47
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Separate profile settings link from the rest on sidebarDmitriy Zaporozhets2015-09-091-5/+6
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rouge-patch' into 'master'Robert Speicher2015-09-092-0/+25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix highlighting of deleted lines in diffs.rouge-patchDouwe Maan2015-09-092-0/+25
| |
* | Merge branch 'issue-1952' into 'master'Kamil Trzciński2015-09-092-0/+6
|\ \ | | | | | | | | | | | | | | | Fixed #1952 docker ssh connection times can be slow when UseDNS is enabled See merge request !1208
| * | Fixed #1952 docker ssh connection times can be slow when UseDNS is enabledRowan Wookey2015-08-262-0/+4
| | |
* | | Merge branch 'redis-session-expire-delay' into 'master'Dmitriy Zaporozhets2015-09-091-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reading session_expire_delay The error occurs when application settings are not yet created and migrations are not yet done. See merge request !1268
| * | | Fix reading session_expire_delay when application settings are not yet ↵Kamil Trzcinski2015-09-091-1/+6
| | | | | | | | | | | | | | | | created and migrations are not yet done
* | | | Merge branch 'fix-emojis-relative-url' into 'master'Douwe Maan2015-09-095-1/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Fix emoji URLs in Markdown when relative_url_root is usedStan Hu2015-09-065-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds the ability to run rspecs with relative_url_defined on the enviornment. For example: RELATIVE_URL_ROOT=/gitlab rspec Closes #1728
* | | | Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets2015-09-093-5/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix UI bugs with discussions Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1265
| * | | | Fix UI bugs with discussionsDmitriy Zaporozhets2015-09-093-5/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'nginx-git-http' into 'master'Dmitriy Zaporozhets2015-09-092-0/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not let NGINX buffer Git HTTP requests Before this change NGINX would convert a chunked HTTP POST (e.g. git push) into a HTTP 1.0 single large POST. This creates an unnecessary delay, and it creates unnecessary memory pressure on gitlab-git-http-server. For the response ('proxy_buffering') I am less sure that NGINX 's buffering behavior is harmful, but it still makes more sense to me not to interfere with gitlab-git-http-server (and the Golang net/http server). See merge request !1256
| * | | | | The good stuff needs NGINX 1.7.11nginx-git-httpJacob Vosmaer2015-09-072-6/+10
| | | | | |
| * | | | | Do not let NGINX buffer Git HTTP requestsJacob Vosmaer2015-09-072-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change NGINX would convert a chunked HTTP POST (e.g. git push) into a HTTP 1.0 single large POST. This creates an unnecessary delay, and it creates unnecessary memory pressure on gitlab-git-http-server. For the response ('proxy_buffering') I am less sure that NGINX 's buffering behavior is harmful, but it still makes more sense to me not to interfere with gitlab-git-http-server (and the Golang net/http server).
* | | | | | Merge branch 'add-meta-referrer-tag' into 'master'Douwe Maan2015-09-091-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add meta tag for referrer https://gitlab.zendesk.com/agent/tickets/7054 Added a meta referrer tag, so that only the origin is sent to third party sites, instead of the entire URL, thus avoiding the leak of sensitive information like password reset tokens. /cc @DouweM See merge request !1263
| * | | | | | Added meta tag for referrer, so that only the origin is sent to third party ↵add-meta-referrer-tagPatricio Cano2015-09-081-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | sites, instead of the entire URL, thus avoiding the leak of sensitive information like password reset tokens.
* | | | | | Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets2015-09-0918-2/+329
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global labels https://dev.gitlab.org/gitlab/gitlabhq/issues/2353 See merge request !1240
| * | | | | | added spinach for glabal labelsglobal_labelsValery Sizov2015-09-035-121/+200
| | | | | | |
| * | | | | | Create labels in new projectValery Sizov2015-09-033-0/+12
| | | | | | |
| * | | | | | CRUD for admin labelsValery Sizov2015-09-0312-39/+275
| | | | | | |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-09-0933-21/+894
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-09-084-5/+5
| |\ \ \ \ \ \ \
View Lorry Controller Status