Commit Graph
18707 Commits
Author SHA1 Message Date
Drew Blessing f07fabc1cd Keep add-diff-note button the same size on hover. Fixes #2497 2015-09-12 09:50:44 -05:00
Job van der Voort d6697bbd94 Merge branch 'improve-error-message' into 'master'
Improve english of error message

See merge request !1284
2015-09-12 12:59:57 +00:00
Robert Schilling 001738e992 Improve english of error message 2015-09-12 14:01:01 +02:00
Dmitriy Zaporozhets 5fcfba2780 Merge branch 'dashboard-titles' into 'master'
Clean up overlap between dashboard and explore

- Clean up overlap between dashboard and explore. ... 5d785457
  - Split up SnippetsController into separate dashboard and explore sections.
  - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
- Consistently case `Back to X` links. 260fcd45
- Link to help from signin page bottom. d92696d3
- Make Help accessible for guests. c258e977

cc @dzaporozhets

See merge request !1260
2015-09-11 14:36:56 +00:00
Douwe Maan 4f461fd45f Merge branch 'rs-fix-highlighting' into 'master'
Syntax highlighting improvements

On the server side:

During development I would occasionally see SanitizationFilter sanitizing
the result of SyntaxHighlightFilter, even though its attributes were
whitelisted. This updates the `clean_spans` transformer to return the
whitelisted node as [suggested by the Sanitize docs](http://git.io/vZR8i).

On the client side:

- Makes the syntax_highlight JS more flexible
- Adds JS specs
- Simplifies highlighting of new notes
- Adds highlighting to Markdown preview

See merge request !1278
2015-09-11 08:47:13 +00:00
Robert Speicher a5bb85f8a2 Merge branch 'rescue-syntax-highlighting-errors-updated' into 'master'
Add comments and clean up test for !1274

See merge request !1279
2015-09-10 22:30:21 +00:00
Stan Hu 267687993a Add comments and clean up test for !1274 2015-09-10 14:24:10 -07:00
Robert Schilling 7904a751f4 Merge branch 'fix-rouge-warning-noise' into 'master'
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-10 21:03:36 +00:00
Stan Hu e20529cec4 Bump rouge to 1.10.1 2015-09-10 13:38:43 -07:00
Robert Speicher e3c97ede96 RU-BO-COOOOOOOOP 2015-09-10 16:06:24 -04:00
Robert Speicher 19c0bf2723 Simplify syntax highlighting of new notes 2015-09-10 15:38:25 -04:00
Robert Speicher 4e54b82326 Apply syntax highlighting to Markdown previews 2015-09-10 15:38:24 -04:00
Robert Speicher 404a01ab14 Add specs for syntax_highlight JS
Also makes it work when given a parent element containing a
`.js-syntax-highlight` element so for dynamically-added things like
notes or Markdown previews, we can more accurately target just the
element we care about.
2015-09-10 15:38:24 -04:00
Robert Speicher 7cbf5e4d18 Prevent result of SyntaxHighlightFilter being sanitized 2015-09-10 15:08:06 -04:00
Stan Hu 3223a2a5ae Bump rouge to 1.10 to remove warning noise and fix other syntax highlighting bugs
Closes #2128

Closes #2433
2015-09-10 11:51:48 -07:00
Robert Schilling b2f3d024c3 Merge branch 'fix-changelog' into 'master'
Fix some CHANGELOG entries

Noticed a few things were off.

See merge request !1276
2015-09-10 18:49:51 +00:00
Stan Hu 201f50b94f Fix some CHANGELOG entries 2015-09-10 11:45:46 -07:00
Robert Speicher 7abb744eb9 Merge branch 'rs-changelog' into 'master'
Add missing 7.14.x CHANGELOG entries

[ci skip]

See merge request !1275
2015-09-10 18:02:00 +00:00
Robert Speicher c86865c1cf Add missing 7.14.x CHANGELOG entries 2015-09-10 13:59:27 -04:00
Robert Schilling b8c05a069b Merge branch 'rescue-syntax-highlighting-errors' into 'master'
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-10 17:45:59 +00:00
Stan Hu 0a2c7fcc64 Merge pull request #9604 from bpetheo/bpetheo_add_service_api_endpoint_to_retrive_service_parameters
Added service API endpoint to retrieve service parameters
2015-09-10 10:40:37 -07:00
Petheo Bence 9bda4b8d88 Added service API endpoint to retrieve service parameters 2015-09-10 18:22:57 +02:00
Stan Hu 9d3344adbb Gracefully handle errors in syntax highlighting by leaving the block unformatted
Closes #2433
2015-09-10 09:16:27 -07:00
Dmitriy Zaporozhets 1c3c3ba512 Merge branch 'ui-improvements' into 'master'
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
2015-09-10 12:34:24 +00:00
Douwe Maan a6997e339b Merge branch 'master' into dashboard-titles 2015-09-10 13:13:01 +01:00
Dmitriy Zaporozhets 059b8828d3 Style syntax highlight area for white theme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 13:36:42 +02:00
Dmitriy Zaporozhets b08c5521f5 Style blob show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 13:25:09 +02:00
Dmitriy Zaporozhets df51b029ab Improve project fork page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 13:14:25 +02:00
Dmitriy Zaporozhets 6933da1ee0 Refactor md variables
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 12:38:07 +02:00
Dmitriy Zaporozhets 86ef2eb728 Conver forked from button to text
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 12:35:37 +02:00
Dmitriy Zaporozhets dadf6daac4 Merge branch 'disable-issue-autofill' into 'master'
Turned off autocomplete for new issue titles

See merge request !1271
2015-09-10 10:17:53 +00:00
Dmitriy Zaporozhets 32208c501a Merge branch 'fix-semaphore-twitter-identity-issue' into 'master'
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
2015-09-10 10:13:21 +00:00
Dmitriy Zaporozhets af3b6f6362 Fix fixed layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 09:52:02 +02:00
Stan Hu 253bc0ca15 Fix test 2015-09-10 00:19:53 -07:00
Robert Speicher 25f684e81d Merge pull request #9617 from dukex/patch-1
Fix 7.14 stable branch name in upgrade docs

[ci skip]
2015-09-09 18:36:05 -07:00
Duke 19cba632d8 fix 7.14 stable branch name 2015-09-09 21:20:51 -03:00
Dmitriy Zaporozhets a0359fbd77 Improve accounts page UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10 00:34:09 +02:00
Dmitriy Zaporozhets 4f0a9beb53 Merge branch 'ui-improvements' into 'master'
Ui improvements

* allow containers without bg and border
* style twbs panels

See merge request !1270
2015-09-09 22:21:38 +00:00
Dmitriy Zaporozhets afb68d2dae Merge branch 'nav-improvements' into 'master'
Profile settings navigation improvements

* separate profile settings link
* get rid of double titles on profile page

See merge request !1269
2015-09-09 22:19:59 +00:00
Darby def939a562 Turned off autocomplete for new issue titles 2015-09-09 15:04:38 -07:00
Dmitriy Zaporozhets 960a1880ab Fix last element of sidebar being hidden for small screens
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:49:34 +02:00
Dmitriy Zaporozhets 12ad9b4ba0 Enable blank container for group settings page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:38:27 +02:00
Dmitriy Zaporozhets 10b6a92481 Style panels and add blank container
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:29:19 +02:00
Dmitriy Zaporozhets 1e3ce07714 Use page title for header title too
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 23:05:47 +02:00
Dmitriy Zaporozhets fa40759768 Separate profile settings link from the rest on sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-09 22:36:13 +02:00
Robert Speicher a81ce718c7 Merge branch 'rouge-patch' into 'master'
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-09 18:37:45 +00:00
Kamil Trzciński 3b610d9821 Merge branch 'issue-1952' into 'master'
Fixed #1952 docker ssh connection times can be slow when UseDNS is enabled

See merge request !1208
2015-09-09 16:42:16 +00:00
Dmitriy Zaporozhets 1ba26b4d1b Merge branch 'redis-session-expire-delay' into 'master'
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
2015-09-09 16:28:01 +00:00
Douwe Maan 0d41b2dd87 Merge branch 'fix-emojis-relative-url' into 'master'
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-09 14:53:14 +00:00
Kamil Trzcinski 0d66d4d342 Fix reading session_expire_delay when application settings are not yet created and migrations are not yet done 2015-09-09 15:31:40 +01:00