summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Fix broken specs. #3945Rubén Dávila2016-01-081-2/+2
| | | | | | |
| * | | | | | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-075-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
| * | | | | | Add some styling for syntax highlighting themes. #3945Rubén Dávila2016-01-072-2/+2
| | | | | | |
| * | | | | | Force white theme when viewing diffs. #3945Rubén Dávila2016-01-062-2/+2
| | | | | | |
| * | | | | | Use #html_safe instead of #raw in some diff views. #3945Rubén Dávila2016-01-063-5/+5
| | | | | | |
| * | | | | | Apply syntax highlighting when expanding diff plus some refactor. #3945Rubén Dávila2015-12-311-1/+1
| | | | | | |
| * | | | | | Fix broken spec and small refactor. #3945Rubén Dávila2015-12-301-1/+1
| | | | | | |
| * | | | | | New implementation for highlighting diff files. #3945Rubén Dávila2015-12-302-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * It is more performant given now we process all the diff file instead of processing line by line. * Multiline comments are highlighted correctly.
| * | | | | | Add syntax highlighting to diff view. #3945Rubén Dávila2015-12-282-5/+9
| | | | | | |
* | | | | | | WIP lazy blobsJacob Vosmaer2016-02-011-0/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'user-ldap-email' into 'master' Robert Speicher2016-01-191-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow LDAP users to change their email if it was not set by the LDAP server Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3054 See merge request !2502
| * | | | | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-191-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'display-message-when-assignee-cannot-merge' into 'master' Dmitriy Zaporozhets2016-01-191-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | adds exclamation point when assigned user cannot merge Fixes: #4175 See merge request !2408
| * | | | Fix spacing issues, fix naming inconsistencies. Fix conflicts.Jacob Schatz2016-01-181-2/+2
| | | | | | | | | | | | | | | | | | | | Used `issuable` instead
| * | | | adds exclamation point when assigned user cannot mergeJacob Schatz2016-01-181-0/+3
| | | | |
* | | | | Merge branch 'fix/artifacts-double-propagation' into 'master' Grzegorz Bizon2016-01-191-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix double request issue in artifacts browser This fixed problem with double propagation when clicking a link that lies inside tr with clicked event attached. See merge request !2496
| * | | | | Fix double request issue in artifacts browserGrzegorz Bizon2016-01-191-1/+5
| |/ / / /
* | | | | Merge branch 'feature/expose-ci-lint-tool'Douwe Maan2016-01-191-1/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove dropdown containing CI Lint button on builds pagefeature/expose-ci-lint-toolGrzegorz Bizon2016-01-181-9/+3
| | | | | | | | | | | | | | | | | | | | Link to CI Lint on builds page will be a separate button from now on.
| * | | | Reuse existing CSS classes when exposing CI Lint toolGrzegorz Bizon2016-01-171-10/+9
| | | | |
| * | | | Expose link to CI Lint Tool on builds pageGrzegorz Bizon2016-01-171-1/+13
| | | | |
* | | | | Improve ux in builds artifacts browserGrzegorz Bizon2016-01-183-18/+24
| |_|_|/ |/| | |
* | | | Replaced "td" with "th" in the Sherlock SQL listsherlock-table-htmlYorick Peterse2016-01-181-1/+1
|/ / /
* | | sanitize user supplied input.Josh Frye2016-01-162-25/+2
| | |
* | | Autofill abuse message text with user url. Closes #2838Josh Frye2016-01-162-1/+24
| | |
* | | Merge branch 'fix-alignment-issue' into 'master' Jacob Schatz2016-01-155-8/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment issues after a fix on titles weight Fixes #8102. Fixes #3956. This fixes an alignment regression introduced by !2422. Sorry about that! :/ ## Commit title alignment fixed ![Screen_Shot_2016-01-14_at_16.10.01](/uploads/8fdc08dca379bc551f5872de910c7149/Screen_Shot_2016-01-14_at_16.10.01.png) **The fact that the first row has a smaller height than the other rows was not introduced by !2422 (I've checked by reverting 818607f0 on `master`).** ## Tags name in list ![Screen_Shot_2016-01-14_at_16.10.09](/uploads/fba3978037677bb8855f374b5f38dde0/Screen_Shot_2016-01-14_at_16.10.09.png) See merge request !2431
| * | Replace strong by span for .item-title elementsfix-alignment-issueRémy Coutable2016-01-155-6/+6
| | |
| * | Streamline item titles to use a single class, and add back strong tagsRémy Coutable2016-01-155-9/+10
| | |
| * | Fix alignment issues after a fix on titles weightRémy Coutable2016-01-142-5/+4
| | |
* | | add missing padding for commit -> builds pageDmitriy Zaporozhets2016-01-141-1/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix layout for empty projectDmitriy Zaporozhets2016-01-141-34/+37
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'rs-fix-cross-reference' into 'master' Robert Speicher2016-01-141-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix cross-project reference clipboard text See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2339 See merge request !2420
| * | | Fix cross-project reference clipboard textRobert Speicher2016-01-131-3/+4
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/4183
* | | | Fix css mess around git clone panel. Align it properlyDmitriy Zaporozhets2016-01-144-16/+17
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix missing padding for user/group pagesDmitriy Zaporozhets2016-01-143-3/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-142-9/+10
|\ \ \ \
| * \ \ \ Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-141-7/+4
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub wiki into GitLab Closes #2834 GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported. Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags. ##### Before `WikiPipeline`: ![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png) ##### After `WikiPipeline`: ![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png) See merge request !2324
| | * | | Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-141-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since GitHub doesn’t apply these constraints to theirs wiki slug allowing characters like `,`, `:`, `*`, etc, we need to relax our constraints or some wiki pages will not be available after they were imported. For an example the Devise project have a wiki page with the following slug: “How To: Add sign_in, sign_out, and sign_up links to your layout template”
| * | | | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-2/+6
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unsubscribe from thread through link in email footer Closes #3437 ![Screenshot_from_2015-12-11_15-35-06](/uploads/cfb3d8737d4757f527995411f103d0ce/Screenshot_from_2015-12-11_15-35-06.png) ![Screenshot_from_2015-12-11_15-35-56](/uploads/9b7121be7ce4b05e5995ca6d38c5bea4/Screenshot_from_2015-12-11_15-35-56.png) See merge request !2068
| | * | | #can_unsubscribe? -> #?unsubscribable?Zeger-Jan van de Weg2016-01-111-1/+1
| | | | |
| | * | | Add #can_unsubscribe? to SentNotificationZeger-Jan van de Weg2016-01-091-1/+1
| | | | |
| | * | | Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-2/+6
| | | | |
* | | | | Merge remote-tracking branch 'origin/rs-autosize'Dmitriy Zaporozhets2016-01-141-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Autosize textareasRobert Speicher2016-01-131-1/+1
| | |/ / | |/| |
* | | | Merge branch 'remove-gray-bg'Dmitriy Zaporozhets2016-01-1453-278/+279
|\ \ \ \ | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add margin to pages where is no headerremove-gray-bgDmitriy Zaporozhets2016-01-144-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Update files/diffs to match new layoutDmitriy Zaporozhets2016-01-146-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix files, project settings and few more pages with new layoutDmitriy Zaporozhets2016-01-144-5/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Dont use nav-pills. Instead use nav-listsDmitriy Zaporozhets2016-01-132-97/+92
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Replace nav-tabs with nav-linksDmitriy Zaporozhets2016-01-136-7/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status