summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'sanitize-new-project-error-message' into 'master' Robert Speicher2016-05-041-1/+1
|\ | | | | | | | | | | | | Sanitize repo paths in new project error message Closes #17243 See merge request !4029
| * Sanitize repo paths in new project error messageStan Hu2016-05-041-1/+1
| | | | | | | | Closes #17243
* | Merge branch 'improve-milestone-ui' into 'master' Jacob Schatz2016-05-042-6/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Improve milestone page UI * remove button after edit button * use hex value for text color * re-use existing text color variables Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !4014
| * Improve milestone page UIimprove-milestone-uiDmitriy Zaporozhets2016-05-032-6/+6
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'clean-user-profile-classes' into 'master' Jacob Schatz2016-05-041-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused .contributed-projects class While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector. See merge request !3945
| * | Remove unused .contributed-projects classKarlo Soriano2016-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector.
* | | Use the new admin settings for gravatarArtem Sidorenko2016-05-041-2/+2
| | |
* | | Merge branch 'remove-unnecessary-method-call-in-events-view' into 'master' Rémy Coutable2016-05-041-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary method call in events view Since `User#to_param` already returns `User#username`, we don't need to pass in the user's username. Changing this also helps us obey LoD. See merge request !3996
| * | | Remove unnecessary method call in events viewKarlo Soriano2016-05-011-1/+1
| |/ / | | | | | | | | | | | | Since `User#to_param` already returns `User#username`, we don't need to pass in the user's username. Changing this also helps us obey LoD.
* | | Merge branch 'rs-unique-signup-fields' into 'master' Douwe Maan2016-05-041-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve uniqueness of field names on the signup form Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075 See merge request !3826
| * | | Improve uniqueness of field names on the signup formrs-unique-signup-fieldsRobert Speicher2016-04-191-2/+2
| | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075
* | | | Improve the Two-factor Authentication sign-in text [ci skip]connorshea2016-05-031-2/+2
| |_|/ |/| | | | | | | | Resolves #14543.
* | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-021-1/+1
|\ \ \
| * \ \ Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-04-261-1/+1
| |\ \ \
| | * | | Fix issue with impersonationDouwe Maan2016-04-221-1/+1
| | | | |
* | | | | Support e-mail notifications for comments on project snippetsStan Hu2016-05-022-0/+9
| | | | | | | | | | | | | | | | | | | | Closes #2334
* | | | | Added UI to define secret_token for webhook and systemhookfeature/backport-safewebhooksGabriel Mazetto2016-05-022-2/+13
| | | | | | | | | | | | | | | | | | | | Codestyle changes to easy EE merge
* | | | | Merge branch 'dz-small-ui-fixes' into 'master' Jacob Schatz2016-04-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move modal css to separate file and fix danger text for confirmation modal * in help file I found css for modal that affect whole application -> moved to separate file * fixed ugly confirmation message when remove project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3979
| * | | | | Move modal css to separate file and fix danger text for confirmation modalDmitriy Zaporozhets2016-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'notification-email-badge-alignment' into 'master' Jacob Schatz2016-04-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated spacing between notification label and button ![Screen_Shot_2016-04-28_at_11.36.26](/uploads/7b33e78e85688d96f878272ee93038ba/Screen_Shot_2016-04-28_at_11.36.26.png) Closes #16552 See merge request !3965
| * | | | | | Updated spacing between notification label and buttonnotification-email-badge-alignmentPhil Hughes2016-04-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #16552
* | | | | | | Merge branch 'emoji_award_coffee_refactoring' into 'master' Jacob Schatz2016-04-291-9/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AwardsHandler follows code style conventions See merge request !3871
| * | | | | | AwardsHandler follows code style conventionsValery Sizov2016-04-261-9/+9
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'gitattributes' into 'master' Rémy Coutable2016-04-291-13/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support supressing text file diffs on the default branch with .gitattributes This change allows users to suppress diffs for text files by adding an entry to the `.gitattributes` file. To take effect the file present at the HEAD of the default branch. When rendering a diff, if the file is text according to the charlock holmes gem (via the `text?` method) but the file is not diffable according to the project repository, then a message is displayed stating that the diff was suppressed. ![image](/uploads/2e119b725875a301e30d9ad482e283b3/image.png) I looked into ways to do this using a `binary` flag as suggested by @stanhu in [this comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/2315#note_4435454), however, there was no good way to seperate what was a real binary file from one that had been marked as not diffable in `.gitattributes`. Fixes and closes gitlab-org/gitlab-ce#2315. See merge request !3806
| * | | | | | Support supressing text file diffs on the default branch with .gitattributesMatt Oakes2016-04-291-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a combination of 3 commits. - Update the bare repositories info/attributes if the default branch is updated - Check the diff attributes of a file before showing a diff - Update CHANGELOG
* | | | | | | Use a better message when milestone is newly createdchange_message_for_newly_created_milestoneArinde Eniola2016-04-291-2/+5
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make some changes for the checks to determine when the messages should be displayed add item to changelog and also integration test make some changes to the test make some changes
* | | | | | Merge branch 'zj-large-files-no-highlight' into 'master' Robert Speicher2016-04-282-10/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly handle bigger files Closes #3967 See merge request !3718
| * | | | | | Properly handle bigger filesZeger-Jan van de Weg2016-04-282-10/+20
| | | | | | |
* | | | | | | Merge branch 'async-new-branch-button' into 'master' Jacob Schatz2016-04-281-4/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load the "New Branch" button asynchronously Here's how it looks like for logged in users: ![new_branch](/uploads/718e3d9016a50a0432b9541dde5ca74c/new_branch.gif) And here it is for anonymous users (or when a new branch can't be created by a logged in user): ![new_branch_anonymous](/uploads/dce42ee6a7dd7708443cdfdb56389d46/new_branch_anonymous.gif) See merge request !3855
| * | | | | | | Load the "New Branch" button asynchronouslyYorick Peterse2016-04-281-4/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This button depends on Issue#can_be_worked_on? which in turn depends on Issue#related_branches. By rendering this button asynchronously we can finally remove all usages of Issue#related_branches and Issue#referenced_merge_requests from the issues "show" page.
* | | | | | | Merge branch 'protected-branches-ui' into 'master' Jacob Schatz2016-04-282-53/+61
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protected branches UI ![Screen_Shot_2016-04-26_at_15.50.10](/uploads/4b905db031aab412bc01616e0be36c1b/Screen_Shot_2016-04-26_at_15.50.10.png) ![Screen_Shot_2016-04-26_at_15.50.00](/uploads/b09229b364ec5361fce375299d39d99c/Screen_Shot_2016-04-26_at_15.50.00.png) Closes #14027 See merge request !3929
| * | | | | | | Protected branches UIprotected-branches-uiPhil Hughes2016-04-262-53/+61
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Closes #14027
* | | | | | | Merge branch 'project-webhooks-ui' into 'master' Jacob Schatz2016-04-282-85/+91
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project webhooks updated UI Closes #13993 ![Screen_Shot_2016-04-26_at_10.55.52](/uploads/684f79be18f8a69e9b5cbcca2c9b20e8/Screen_Shot_2016-04-26_at_10.55.52.png) ![Screen_Shot_2016-04-26_at_10.55.37](/uploads/9b9f3a8a243dec955f23967e20ec514f/Screen_Shot_2016-04-26_at_10.55.37.png) See merge request !3922
| * | | | | | | Project webhooks updated UIPhil Hughes2016-04-262-85/+91
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes #13993
* | | | | | | Merge branch 'project-deploy-keys-ui' into 'master' Jacob Schatz2016-04-283-81/+64
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project deploy keys updated UI Closes #13992 See merge request !3912
| * | | | | | Updated tests for deploy keysproject-deploy-keys-uiPhil Hughes2016-04-251-6/+4
| | | | | | |
| * | | | | | Project deploy keys updated UIPhil Hughes2016-04-253-82/+67
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Closes #13992
* | | | | | Merge branch 'updated-triggers-ui' into 'master' Jacob Schatz2016-04-282-65/+62
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated triggers UI ![Screen_Shot_2016-04-27_at_14.05.35](/uploads/971bc907f62abd397368c8c088ff0cf1/Screen_Shot_2016-04-27_at_14.05.35.png) ![Screen_Shot_2016-04-27_at_14.05.32](/uploads/5e0e87998e25e7e89cdd6fb8d6035542/Screen_Shot_2016-04-27_at_14.05.32.png) Closes #14090 See merge request !3946
| * | | | | | Updated triggers UIupdated-triggers-uiPhil Hughes2016-04-272-65/+62
| | |/ / / / | |/| | | | | | | | | | | | | | | | Closes #14090
* | | | | | Merge branch 'project-group-ui' into 'master' Jacob Schatz2016-04-284-42/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project group UI Closes #13991 ![Screen_Shot_2016-04-25_at_14.54.49](/uploads/e55fd1731a479d93660a1ff8359f56d6/Screen_Shot_2016-04-25_at_14.54.49.png) See merge request !3911
| * | | | | | Fixed failing testsPhil Hughes2016-04-251-4/+2
| | | | | | |
| * | | | | | Updated select box to match designPhil Hughes2016-04-251-1/+3
| | | | | | |
| * | | | | | Updated project group sharing UIPhil Hughes2016-04-254-42/+45
| | |/ / / / | |/| | | | | | | | | | | | | | | | Closes #13991
* | | | | | Make layout navigation gray and fluidnavigation-redesignDmitriy Zaporozhets2016-04-281-4/+4
| |_|/ / / |/| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'add-js-prefix-to-user-tab-classes' into 'master' Jacob Schatz2016-04-271-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add JS prefix to user tab classes ## What does this MR do This MR adds the `js-` prefix to the classes which are used for js purposes only. This MR only affects the said classes inside `users/show.html.haml`. ## Are there points in the code the reviewer needs to double check? I'm not entirely sure if this project uses the `js-` prefix for classes that are used for js purposes only. Doing a grep shows some of the classes have the prefix, but I'm still unsure whether this project follows this rule. ## Why was this MR needed? As I was working thru #13401, I wanted to add a tab on the user profile page to show the contributions outside the GitLab instance. Reading the JS, I came across this. This MR helps new people reading the code that the said classes are for js purposes only. Also, it helps the project work toward to uniform class naming. I suggest that we document adding the `js-` prefix to classes for js purposes only (if this is the case for this project) See merge request !3928
| * | | | Add JS prefix to user tab classesKarlo Soriano2016-04-261-3/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | I'm not entirely sure if this project uses the `js-` prefix for classes that are for js purposes only. But as I was working on a feature, I noticed that these classes were those kind of classes.
* | | | Hide button on mobileAlfredo Sumaran2016-04-261-2/+2
| | | |
* | | | Update syntaxAlfredo Sumaran2016-04-261-2/+2
| | | |
* | | | Hide whitespace toggle button for new merge requestsAlfredo Sumaran2016-04-262-5/+7
| | | |
* | | | Add Hide/show whitespace changes button on diff and commit viewAlfredo Sumaran2016-04-261-0/+4
| | | |