summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'notification-levels' into 'master' Douwe Maan2015-09-211-0/+16
|\
| * Merge branch 'master' into notification-levelsPatricio Cano2015-09-166-0/+235
| |\
| * \ Merge branch 'master' into notification-levelsPatricio Cano2015-09-163-3/+13
| |\ \
| * | | Added Global to the drop downs and updated the label of the button to show th...Patricio Cano2015-09-161-2/+10
| * | | Replaced `this` with `@` in the coffee file and added an arrow that clearly m...Patricio Cano2015-09-141-3/+3
| * | | Notification dropdown now shows currently active level, and also shows what t...Patricio Cano2015-09-141-1/+3
| * | | Notification level can now be saved from within the project view.Patricio Cano2015-09-141-0/+6
* | | | Fix IssuableContext javascriptRobert Speicher2015-09-181-4/+5
| |_|/ |/| |
* | | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...Kamil Trzcinski2015-09-151-16/+31
|\ \ \
| * | | Change the replace placeholder to use the filenamefix-upload-uiStan Hu2015-09-151-16/+31
* | | | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...Kamil Trzcinski2015-09-151-0/+52
|\ \ \ \ | |/ / /
| * | | Merge pull request #9138 from liyakun/masterStan Hu2015-09-141-0/+52
| |\ \ \ | | |_|/ | |/| |
| | * | Add "Replace" and "Upload" featuresliyakun2015-09-151-0/+52
| | |/
* | | Fix 500 when search for gitlab projectsDmitriy Zaporozhets2015-09-111-3/+3
* | | Use GitLab UI when render CIDmitriy Zaporozhets2015-09-111-10/+0
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-113-3/+13
|\ \ \ | |/ /
| * | Simplify syntax highlighting of new notesRobert Speicher2015-09-101-2/+3
| * | Apply syntax highlighting to Markdown previewsRobert Speicher2015-09-101-0/+1
| * | Add specs for syntax_highlight JSRobert Speicher2015-09-101-1/+9
| |/
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-096-11/+24
|\ \ | |/
| * Merge branch 'rs-dev-issue-2466' into 'master'Douwe Maan2015-09-071-0/+2
| |\
| | * Remove style attribute from textarea during ZenMode activationrs-dev-issue-2466Robert Speicher2015-09-041-0/+2
| * | Add syntax highlight scheme to notes rendered client-siders-highlight-new-notesRobert Speicher2015-09-042-1/+5
| |/
| * Fix tab toggle on activityDmitriy Zaporozhets2015-09-031-1/+1
| * Redesign activity feed on dashboard and project pagesDmitriy Zaporozhets2015-09-031-1/+1
| * Prevent anchors from being hidden by header upon a new page load.Stan Hu2015-08-291-5/+7
| * Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan2015-08-271-0/+9
| |\
| | * Remove user_color_scheme_classRobert Speicher2015-08-251-0/+9
| * | Refactor project list renderingDmitriy Zaporozhets2015-08-261-4/+0
* | | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-263-1/+8
|\ \ \ | |/ /
| * | Merge branch 'separate-activity' into 'master'Dmitriy Zaporozhets2015-08-252-1/+2
| |\ \ | | |/ | |/|
| | * Make some visual improvements to dashboard page after we moved activityDmitriy Zaporozhets2015-08-251-1/+1
| | * Dashboard activity as separate pageDmitriy Zaporozhets2015-08-251-0/+1
| * | Improve abuse reports managementDmitriy Zaporozhets2015-08-251-0/+6
| |/
* | Update gitignore, change literal DB table names, fix errors, fix fontawesomeDouwe Maan2015-08-262-2/+2
* | Groundwork for merging CI into CEDouwe Maan2015-08-255-0/+178
|/
* Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan2015-08-211-0/+2
|\
| * Fix bug preventing invite by e-mailStan Hu2015-08-211-0/+2
* | Merge branch 'commit-image-branch' into 'master'Dmitriy Zaporozhets2015-08-211-4/+5
|\ \ | |/ |/|
| * Fixed JS issue with diff image loadingPhil Hughes2015-03-261-4/+5
* | Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-171-5/+0
|\ \
| * | Bring clone bar backStan Hu2015-08-121-5/+0
| * | Refactor merge request widgetDmitriy Zaporozhets2015-08-111-4/+2
* | | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-5/+3
|/ /
* | Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-1/+1
* | Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-111-2/+4
* | Add dropzone upload progressNikita Verkhovin2015-08-101-1/+8
* | Refactor merge request widgetDmitriy Zaporozhets2015-08-071-4/+2
* | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-051-1/+1
|\ \
| * \ Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-047-18/+25
| |\ \
View Lorry Controller Status