Commit Graph

75 Commits

Author SHA1 Message Date
Jared Deckard 7f6474b269 Restore comments lost when converting CoffeeScript to JavaScript 2016-09-08 12:23:12 -05:00
Mike Greiling b2f8ebbb42 refactor sidebar logic into singleton class 2016-09-07 14:02:21 -05:00
Mike Greiling 33694a5a64 use gitlab global root url as canonical base url for all javascript set cookies (closes #20435) 2016-08-24 22:11:28 -05:00
Jacob Schatz 8fc800cbcc Merge branch 'ace-ventura' into 'master'
Ace ventura

## What does this MR do?

Makes Ace only load when it's actually necessary. The only two places it seems to be used is for Snippets and the File (Blob) Editor.

Before minification or compression, this takes the application.js down from 2.2MB to 1.6MB, and also removes two inline scripts :D

Compressed/Minified: master: 317KB/1.1MB, ace-ventura: 220KB/771KB

## Are there points in the code the reviewer needs to double check?

That this doesn't just completely break anything.

## Why was this MR needed?

Ace is a big library, this allows us to only load it when necessary.

## What are the relevant issue numbers?

#14372

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4914
2016-08-19 17:06:30 +00:00
Phil Hughes 52c6102460 Destroy branch delete tooltip when row is removed
Closes #19528
2016-08-19 14:29:23 +01:00
Douwe Maan 8b05e8c2d1 Merge branch 'master' into diff-line-comment-vuejs
# Conflicts:
#	db/schema.rb
2016-08-18 16:43:26 -05:00
Connor Shea 0baaf490e2 Only load Ace on Snippets and file edit pages. 2016-08-18 21:48:10 +01:00
Jacob Schatz d97c83096a Merge branch '3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webui' into 'master'
Fix Ace syntax highlighting with compiled assets

## What does this MR do?

Update ACE to 4.1.0 to allow modes (syntax highlighting files for particular languages) to be lazily loaded.

## Are there points in the code the reviewer needs to double check?

Don't think so.

## Why was this MR needed?

Syntax highlighting in the file editor only worked in development and test modes, not in production!

## What are the relevant issue numbers?

Closes #3225.

## Screenshots (if relevant)

First, the test setup - add these lines to `development.rb`:
```ruby
  config.assets.debug = false
  config.assets.compile = false
  config.assets.digest = true
```

Then, before starting the server, run `bundle exec rake assets:clobber assets:precompile`.

Before:

![image](/uploads/486198e273019f8969d2e90560d82928/image.png)

There is an error in the console because `/assets/ace/mode-ruby.js` was not found (it's only available when assets are compiled on demand).

After:

![image](/uploads/6aa0d69b7efdfd6fe6aa22b9a49e9716/image.png)

This loads `/assets/ace/mode-ruby-3915f95a6cc47306b1305e4dcb7aca25b2ef9c49b18ec6011707135b6575d8f3.js`, which works because the precompile step included it and told ACE where to find it.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- ~~API support added~~
- Tests
  - ~~Added for this feature/bug~~
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5501
2016-08-18 20:31:17 +00:00
Jacob Schatz c063ee5e35 Merge branch 'fix-diff-comments-bug' into 'master'
Fix diff comments inverted toggle bug

## What does this MR do?
Explicitly set the comments visibility toggle based on the `active` css class.

## Are there points in the code the reviewer needs to double check?
Shouldn't be

## Why was this MR needed?
Fixes existing UI bug

## What are the relevant issue numbers?
Closes #20898 

## Screenshots (if relevant)
Before:
![A1ccIDEWsI](/uploads/21175e2008ee4e00225c22afebd873aa/A1ccIDEWsI.gif)

After:
![jHoFp69mAK](/uploads/e85f429d60a4e56d588faec51cd8648a/jHoFp69mAK.gif)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5818
2016-08-17 17:44:26 +00:00
Clement Ho e45064e8dc Fix diff comments inverted toggle bug 2016-08-17 09:43:45 -05:00
Sean McGivern b73ff13e8a Fix Ace syntax highlighting with compiled assets 2016-08-17 14:33:56 +01:00
Connor Shea 1d3aa59f99
Merge branch 'master' into diff-line-comment-vuejs 2016-08-16 16:59:19 -06:00
Felipe Artur 2872672945 Load issues and merge requests templates from repository 2016-08-16 15:50:17 -03:00
Connor Shea 1595047777
Single quotes for consistency, cache 'this' selector. 2016-08-15 11:18:48 -06:00
Douwe Maan c770201061 Merge branch 'master' into diff-line-comment-vuejs 2016-08-12 17:23:19 -05:00
Annabel Dunstone 9955dc29a8 Update timeago to shorter representation 2016-08-04 15:01:37 -05:00
Douwe Maan 6d9715d877 Show existing discussion when adding new comment on line with a hidden resolved discussion 2016-07-28 19:28:56 -06:00
Fatih Acet aaa9509d12 ES6ify all the things! 2016-07-24 23:45:11 +03:00
Dmitriy Zaporozhets 3ef0a625ac
Applications js to coffee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-24 16:12:23 +02:00
Dmitriy Zaporozhets c1fd25ce6e
Replace turbolink spinner with nprogress
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-19 12:59:23 +02:00
Dmitriy Zaporozhets 1794f606bd
Use ace editor as gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-10 16:18:46 +02:00
Dmitriy Zaporozhets c7966a426b
Include highlight.js assets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-26 21:33:04 +02:00
Dmitriy Zaporozhets 8a17961126
Replace chosen with select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-11 12:11:54 +02:00
Karlo Soriano 71d67e6557 Contributors graphs feature for GitLab
Created tests and refactored some code along the way

Added stat graph util spec, refactored code

finsihed up tests and refactors

finsihed up tests and refactors
2013-06-05 16:51:48 +08:00
Dmitriy Zaporozhets 646fbe9286 bring more usability to issues filtering. Block issues area on loading filtered results 2013-05-08 13:43:21 +03:00
Dmitriy Zaporozhets de7d6431b1 Add turbolinks to application 2013-04-29 10:10:45 +03:00
Dmitriy Zaporozhets bf17d976a7 add api users filter and integrate users select2 2013-03-13 23:19:09 +02:00
Dmitriy Zaporozhets b339c747a9 Merge pull request #1937 from riyad/add-file-line-links
Add file line links
2012-11-16 03:46:43 -08:00
randx 1c5b2a5153 Stats page 2012-11-10 23:08:47 +02:00
Riyad Preukschas 45dcb1b5c4 Add jQuery.ScrollTo 2012-11-09 23:35:02 +01:00
Valeriy Sizov 8ee8f36f6e WebEditor: fix unknown theme in production mode 2012-10-16 23:52:44 +03:00
Valeriy Sizov 57e2b5ed1a WebEditor: integrated editor 2012-10-12 20:07:24 +03:00
Robert Speicher cda5e66d7c Use History.js for better Tree browsing
Closes #1578
2012-10-09 18:38:59 -04:00
Nihad Abbasov 80bcba4ee2 install jquery-atwho-rails 2012-09-23 08:53:48 -07:00
randx 0523b4265b Application logger 2012-09-11 23:24:53 +03:00
Nihad Abbasov 66684d6d50 move code from application.js to separate file 2012-09-06 05:47:13 -07:00
randx 4a6596af27 Fixed bunch of js bugs with comments. Also added development tips 2012-08-30 21:31:55 +03:00
Dmitriy Zaporozhets 0e5dbd1caf Merge pull request #1231 from NARKOZ/preview_notes
Preview window is not closed after post
2012-08-23 06:56:55 -07:00
Dmitriy Zaporozhets 813814f02e Application cleanup 2012-08-17 09:09:11 +03:00
Nihad Abbasov 0b7e67ad12 fix note preview link, and hide preview and errors after posting a comment 2012-08-14 01:24:27 -07:00
Nihad Abbasov 9639780359 render notes preview on server-side 2012-08-09 23:47:48 -07:00
Nihad Abbasov 1ec3bd3f8d ability to preview notes 2012-08-08 01:12:05 -07:00
randx 00b280c3f9 Feature: Bulk Issues update 2012-07-28 03:35:43 +03:00
Dmitriy Zaporozhets f88a2617e6 Tree ajax log. progress bar & refactoring 2012-07-10 23:12:38 +03:00
randx 1a2bacfb4b Feature: ajax load for tree commit log 2012-07-10 22:52:38 +03:00
Staicu Ionut ba7b85d0d9 issues counter are now live updated on creation/deleteion/reopening
buttons on forms are disabled on submit (re-enabled after the request is complete)
2012-07-10 07:33:04 +03:00
Nihad Abbasov da5cf9d085 downgrade raphael js to 1.5.2 2012-06-22 01:57:05 -07:00
randx d5b41831d1 missed ; 2012-06-20 23:08:10 +03:00
randx 1a05f2f7c9 Get rid of deprecated link_to_function 2012-06-20 21:29:55 +03:00
Zevs 6507c1085e Revert "Handle Commit "show suppressed diff" link with a doc-ready event handler."
This reverts commit ef1598b4af.
2012-06-20 21:01:27 +03:00