summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-204-0/+25
|\
| * Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-204-0/+25
* | Merge branch 'sentry-integration' into 'master' Robert Speicher2016-01-204-1/+39
|\ \
| * | Target '_blank'sentry-integrationDouwe Maan2016-01-201-2/+2
| * | Send user context to SentryDouwe Maan2016-01-201-0/+11
| * | Use sentry in env production onlyJeroen Nijhof2016-01-201-1/+3
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into sentry-...Jeroen Nijhof2016-01-2024-65/+131
| |\ \ | | |/
| * | Add sentry integrationJeroen Nijhof2016-01-183-0/+25
* | | Merge branch 'awardemoji-tooltip-shows-people-multiple-times' into 'master' Dmitriy Zaporozhets2016-01-201-10/+7
|\ \ \
| * | | Fixes issue where other emoji (not thumbup/thumbdown) were not removedawardemoji-tooltip-shows-people-multiple-timesJacob Schatz2016-01-191-1/+1
| * | | Fix the situation where the user has named themselves "me"Jacob Schatz2016-01-181-4/+2
| * | | Fix underlying issue with emoji reactionsJacob Schatz2016-01-181-6/+8
| * | | Removing initial `,`.Jacob Schatz2016-01-181-1/+2
| * | | Fixes tooltip doesn't duplicate the "me" name.Jacob Schatz2016-01-181-8/+4
* | | | Merge branch 'secret-shortcut-feature' into 'master' Dmitriy Zaporozhets2016-01-205-6/+5
|\ \ \ \
| * | | | Simplifies the HAML if statement for project branch URLJacob Schatz2016-01-201-6/+2
| * | | | Fix HTML so code passessecret-shortcut-featureJacob Schatz2016-01-201-2/+2
| * | | | Fix project find url so branch ref is not nilJacob Schatz2016-01-192-3/+7
| * | | | Proper spacing in HAML file `if` statement.Jacob Schatz2016-01-191-1/+1
| * | | | Removes `defined?` in favor to just `if`Jacob Schatz2016-01-191-1/+1
| * | | | Add reference to the correct branch.Jacob Schatz2016-01-191-1/+1
| * | | | Adds `t` as a shortcut for find file anywhereJacob Schatz2016-01-194-5/+4
* | | | | Merge branch 'issue_3749' into 'master' Douwe Maan2016-01-201-1/+1
|\ \ \ \ \
| * | | | | Update Issue/MR everytime a Note is saved/destroyed.Rubén Dávila2016-01-192-5/+2
| * | | | | Check if object respond to #touch before update.Rubén Dávila2016-01-181-1/+2
| * | | | | Update Issues/MRs updated_at when user leaves comments.Rubén Dávila2016-01-181-1/+3
| | |_|/ / | |/| | |
* | | | | Remove `Compressed to` column from build artifacts browserci/artifacts-remove-compressed-sizeGrzegorz Bizon2016-01-203-4/+0
| |_|_|/ |/| | |
* | | | Merge branch 'add_email_headers' into 'master' Robert Speicher2016-01-193-7/+27
|\ \ \ \
| * | | | Added X-GitLab-... headers to emails from CI and Email On Push servicesAnton Baklanov2016-01-193-7/+27
| | |/ / | |/| |
* | | | Merge branch 'user-ldap-email' into 'master' Robert Speicher2016-01-192-3/+6
|\ \ \ \
| * \ \ \ Merge branch 'master' into user-ldap-emailDouwe Maan2016-01-196-21/+17
| |\ \ \ \
| * | | | | Allow LDAP users to change their email if it was not set by the LDAP serverDouwe Maan2016-01-192-3/+6
* | | | | | Merge branch 'add-public-param-to-project-api' into 'master' Dmitriy Zaporozhets2016-01-191-0/+4
|\ \ \ \ \ \
| * | | | | | Add specs. Adjust filter.Josh Frye2016-01-191-1/+1
| * | | | | | Change 'public' flag to more robust 'visibility' query.Josh Frye2016-01-191-0/+4
| |/ / / / /
* | | | | | Merge branch 'star-button-fork-count-increase' into 'master' Dmitriy Zaporozhets2016-01-191-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | when starring a project it correctly increase the star countPhil Hughes2016-01-191-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'display-message-when-assignee-cannot-merge' into 'master' Dmitriy Zaporozhets2016-01-193-0/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Move multiple css rules to multiple lines.display-message-when-assignee-cannot-mergeJacob Schatz2016-01-192-2/+2
| * | | | Fix spacing issues, fix naming inconsistencies. Fix conflicts.Jacob Schatz2016-01-182-4/+4
| * | | | color variable for error for exclamation pointJacob Schatz2016-01-182-2/+4
| * | | | adds exclamation point when assigned user cannot mergeJacob Schatz2016-01-182-0/+8
* | | | | Merge branch 'fix-project-creation' into 'master' Douwe Maan2016-01-191-1/+1
|\ \ \ \ \
| * | | | | Fix creator should be added as a master of the project on creationDouglas Barbosa Alexandre2016-01-191-1/+1
* | | | | | Merge branch 'improve-project-external-issue-trackers' into 'master' Douwe Maan2016-01-195-20/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Greatly improve external_issue_tracker performanceimprove-project-external-issue-trackersYorick Peterse2016-01-195-20/+16
* | | | | | Merge branch 'fix/artifacts-double-propagation' into 'master' Grzegorz Bizon2016-01-191-1/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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
View Lorry Controller Status