summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Refactor creating notification setting with defaultsDmitriy Zaporozhets2016-03-303-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Remove useless Notification modelDmitriy Zaporozhets2016-03-304-28/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Refactor notification helper and fix notification serviceDmitriy Zaporozhets2016-03-302-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Small refactoring and cleanup of notification logicDmitriy Zaporozhets2016-03-305-58/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Update NotificationService to use NotificationSettings instead of membershipDmitriy Zaporozhets2016-03-307-54/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Create notification setting when membership createdDmitriy Zaporozhets2016-03-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Introduce NotificationSetting to user interfaceDmitriy Zaporozhets2016-03-3010-93/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * visiting project will create notification setting if missing * change notification setting per project even without membership * use notification settings instead of membership on profile page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Introduce NotificationSetting modelDmitriy Zaporozhets2016-03-301-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will hold notification setting per group or per project. It will allow get rid of notification level stored in Member model Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | Merge branch 'commit-message-prefilled' into 'master' Jacob Schatz2016-04-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefills commit message in edit file See #14488 ![Screen_Shot_2016-04-06_at_10.18.06](/uploads/2ace2a21a6ead8d83c79ef9ce5dd34cc/Screen_Shot_2016-04-06_at_10.18.06.png) See merge request !3564
| * | | | | | | | | | | | | Added back text used on merge commit messagecommit-message-prefilledPhil Hughes2016-04-111-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Prefills commit message in edit filePhil Hughes2016-04-111-1/+1
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See #14488
* | | | | | | | | | | | | Merge branch 'build-notification-fixes' into 'master' Jacob Schatz2016-04-124-13/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build notification null check Cancels build notification interval on page change See merge request !3540
| * | | | | | | | | | | | | Fixed failing testsbuild-notification-fixesPhil Hughes2016-04-111-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed missed conflictPhil Hughes2016-04-111-4/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Preparing build textPhil Hughes2016-04-112-4/+21
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Hides notification after X amount of secondsPhil Hughes2016-04-111-0/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Corrects the button color on build status changePhil Hughes2016-04-111-1/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Rubocop fixPhil Hughes2016-04-111-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Preparing build statusPhil Hughes2016-04-111-0/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Build notification null checkPhil Hughes2016-04-112-7/+15
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cancels build notification interval on page change
* | | | | | | | | | | | | Merge branch 'fix-missing-saml-error-handling' into 'master' Robert Speicher2016-04-121-10/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add proper nil and error handling to SAML login process While writing the feature that would allow certain Omniauth providers to be marked as external I noticed that there is a scenario where the `gl_user` method can return `nil` and if this is not properly checked, it will lead to exceptions that will cause 500 errors. It is quite easy to land in this scenario, so I added `nil` checks. I also noticed that the `saml` method in the `omniauth_callbacks_controller.rb` file lacked a `rescue` for `Gitlab::OAuth::SignupDisabledError`, which can happen if the default configuration from `1_settings.rb` is applied. So I also added this check. See merge request !3609
| * | | | | | | | | | | | | Add missing proper nil and error handling to SAML login process.Patricio Cano2016-04-071-10/+16
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'feature/fix-14753' into 'master' Rémy Coutable2016-04-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #14753: Check if head is born before trying to detect main language This MR makes sure that head exists before trying to detect the main language. This prevents errors on repo's without a master branch. Closes #14753 See merge request !3654
| * | | | | | | | | | | | | | Dont return nullJeroen Bobbeldijk2016-04-111-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add changelog, change code to guard clauseJeroen Bobbeldijk2016-04-111-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Check head unborn in ruggedJeroen Bobbeldijk2016-04-111-1/+1
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'hide_help_block_when_creating_project_inside_group' into 'master' Rémy Coutable2016-04-123-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide help block when user is creating a new project inside a group closes #14092 ![fix](/uploads/13721117c410c8fe6937d44a3b0a90a8/fix.gif) See merge request !3427
| * | | | | | | | | | | | | | hide help block when user is creating a new project inside a groupArinde Eniola2016-04-123-4/+26
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Fix code review issuesRobert Schilling2016-04-121-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Delete notes via APIRobert Schilling2016-04-122-3/+10
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'issue_1752' into 'master' Robert Speicher2016-04-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix milestone removal problem when editing issues fixes #1752 See merge request !3571
| * | | | | | | | | | | | | Fix milestone removal problem when editing issuesFelipe Artur2016-04-061-0/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix-revert-scroll' into 'master' Jacob Schatz2016-04-111-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix scroll bars shown in Revert dialogue box ## What does this MR do? Eliminate scroll bars shown in Revert dialogue box, see the screenshots. ## Are there points in the code the reviewer needs to double check? N/A ## Why was this MR needed? Ugly scroll bars are shown in Revert dialogue box. ## What are the relevant issue numbers? N/A ## Screenshots ![Screen_Shot_2016-04-05_at_15.27.10](/uploads/428295858ada7cd2fcdf1e831c42f8ec/Screen_Shot_2016-04-05_at_15.27.10.png) See merge request !3532
| * | | | | | | | | | | | | Eliminate ugly scroll bars shown in modal boxesP.S.V.R2016-04-051-0/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'dashboard-filter-milestone' into 'master' Jacob Schatz2016-04-111-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with dashboard/issues not filtering by milestone Closes #15128 See merge request !3650
| * | | | | | | | | | | | | Fixed issue with dashboard/issues not filtering by milestonedashboard-filter-milestonePhil Hughes2016-04-111-1/+7
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15128
* | | | | | | | | | | | | Merge branch 'rs-form_errors' into 'master' Dmitriy Zaporozhets2016-04-1132-153/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize the way we check for and display form errors - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard. See merge request !3531
| * | | | | | | | | | | | | Standardize the way we check for and display form errorsrs-form_errorsRobert Speicher2016-04-0432-153/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard.
* | | | | | | | | | | | | | Merge branch 'mr-ui-update' into 'master' Jacob Schatz2016-04-1116-97/+265
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated UI for new merge request Closes #2540 ![Screen_Shot_2016-03-29_at_12.53.18](/uploads/426e603675171f0dc4e0af83c7762eba/Screen_Shot_2016-03-29_at_12.53.18.png) ![Screen_Shot_2016-03-29_at_12.53.13](/uploads/645ad7955acfb9f7693245fcc048ee49/Screen_Shot_2016-03-29_at_12.53.13.png) See merge request !3228
| * | | | | | | | | | | | | Merge request mobile spacingmr-ui-updatePhil Hughes2016-04-111-2/+11
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed dropdown title overlapPhil Hughes2016-04-111-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Addressed feedbackPhil Hughes2016-04-114-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed important from css
| * | | | | | | | | | | | | Build fixPhil Hughes2016-04-061-0/+4
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed buildsPhil Hughes2016-04-063-12/+9
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed spacing in MR footerPhil Hughes2016-04-061-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Removed un-used get requestPhil Hughes2016-04-061-2/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed target project updatePhil Hughes2016-04-066-38/+42
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Filters by text on elementPhil Hughes2016-04-062-7/+31
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Checkmarks in dropdowns for already selected valuesPhil Hughes2016-04-062-7/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Use new dropdowns for MR comparePhil Hughes2016-04-064-30/+80
| | | | | | | | | | | | | |