summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added documentation on the various profiling toolsview-issue-performanceYorick Peterse2015-10-151-0/+56
* Fixed Rubocop styling issuesYorick Peterse2015-10-152-5/+5
* Renamed Note.inc_associations to with_associationsYorick Peterse2015-10-152-2/+2
* Changelog entry for issue page speedupsYorick Peterse2015-10-151-0/+1
* Don't use link_to/image_tag where not neededYorick Peterse2015-10-153-8/+8
* Improve ProjectTeam#max_member_access performanceYorick Peterse2015-10-152-3/+39
* Eager load project associations for notesYorick Peterse2015-10-151-1/+2
* Eager load note projects when viewing issuesYorick Peterse2015-10-151-1/+4
* Added rack-lineprof for developmentYorick Peterse2015-10-154-1/+41
* Added active_record_query_traceYorick Peterse2015-10-153-0/+8
* Added Bullet to the GemfileYorick Peterse2015-10-153-0/+12
* Use note.author for issue comment avatarsYorick Peterse2015-10-151-1/+1
* Eager load various issue/note associationsYorick Peterse2015-10-154-3/+9
* Re-use User for avatars in link_to_memberYorick Peterse2015-10-152-1/+15
* Re-use User objects for avatar_icon where possibleYorick Peterse2015-10-1516-17/+17
* Allow avatar_icon to operate on a UserYorick Peterse2015-10-152-3/+16
* Merge branch 'rs-update-uglifier' into 'master' Dmitriy Zaporozhets2015-10-152-3/+3
|\
| * Update uglifier to ~> 2.7.2rs-update-uglifierRobert Speicher2015-10-142-3/+3
* | Merge branch 'rs-issues_sentence' into 'master' Douwe Maan2015-10-151-1/+1
|\ \
| * | Simplify the `issues_sentence` helperrs-issues_sentenceRobert Speicher2015-10-141-1/+1
* | | Merge branch 'rs-mr-tabs-scroll' into 'master' Douwe Maan2015-10-151-4/+4
|\ \ \
| * | | Prevent a JS error in MergeRequestTabsrs-mr-tabs-scrollRobert Speicher2015-10-141-4/+4
* | | | Merge branch 'incoming-email-config' into 'master' Robert Speicher2015-10-1410-254/+201
|\ \ \ \
| * | | | Shut up, RubocopRobert Speicher2015-10-141-1/+1
| * | | | Add defaults for incoming_email ssl and start_tls.incoming-email-configDouwe Maan2015-10-141-4/+6
| * | | | Make Reply by email easier to configureDouwe Maan2015-10-1310-254/+199
* | | | | Merge branch 'simplify-cross-references' into 'master' Robert Speicher2015-10-1419-113/+70
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make Mentionable#cross_reference_exists? private.simplify-cross-referencesDouwe Maan2015-10-142-13/+6
| * | | | Shut up, RubocopRobert Speicher2015-10-141-1/+1
| * | | | Use `to_reference` where possible.Douwe Maan2015-10-131-2/+2
| * | | | Fix mentionable specsDouwe Maan2015-10-124-7/+6
| * | | | Remove useless assignmentDouwe Maan2015-10-121-1/+1
| * | | | Chaining ftwDouwe Maan2015-10-121-5/+1
| * | | | Fix cross-references originating from notesDouwe Maan2015-10-124-20/+7
| * | | | Simplify code around (cross)-referencesDouwe Maan2015-10-1214-76/+58
* | | | | Merge branch 'show_pending_warning' into 'master' Kamil Trzciński2015-10-1415-24/+257
|\ \ \ \ \
| * | | | | Fix warning signshow_pending_warningKamil Trzcinski2015-10-143-6/+5
| * | | | | Fix specsKamil Trzcinski2015-10-141-1/+1
| * | | | | Show warning if build doesn't have runners with specified tags or runners did...Kamil Trzcinski2015-10-1414-22/+256
* | | | | | Merge branch 'predefined_build_variables' into 'master' Kamil Trzciński2015-10-145-19/+70
|\ \ \ \ \ \
| * | | | | | Use tag? instead of tag to indicate that this is booleanpredefined_build_variablesKamil Trzcinski2015-10-141-1/+1
| * | | | | | Added CI_BUILD_TAG, _STAGE, _NAME and _TRIGGERED to CI buildsKamil Trzcinski2015-10-145-19/+70
| |/ / / / /
* | | | | | Merge branch 'uploads_path_fix' into 'master' Valery Sizov2015-10-1417-10/+225
|\ \ \ \ \ \
| * | | | | | Fix: Images cannot show when projects' path was changeduploads_path_fixValery Sizov2015-10-1417-10/+225
* | | | | | | Merge branch 'revert_service_passwd' into 'master' Valery Sizov2015-10-146-78/+13
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Revert "Improve invalidation of stored service password if the endpoint URL i...Valery Sizov2015-10-146-78/+13
|/ / / / / /
* | | | | | Merge branch 'fix/improve_reset_service_password' into 'master' Valery Sizov2015-10-146-13/+78
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Improve invalidation of stored service password if the endpoint URL is changedAlex Lossent2015-10-146-13/+78
* | | | | | Merge remote-tracking branch 'origin/cernvcs_hide_passwrd'Valery Sizov2015-10-145-3/+53
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-cecernvcs_hide_passwrdValery Sizov2015-10-145-3/+53
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |