Commit Graph

19459 Commits (2f23697c05afb779ce82134b10ecf85d2beadbac)
 

Author SHA1 Message Date
Alex Coles 2f23697c05 Merge branch 'feature/include_rubocop' into dev 10 years ago
Alex Coles c13f021b7f Merge branch 'dev' into feature/include_rubocop 10 years ago
Alex Coles e24dfeb31d Merge branch 'release/4.0' into dev 10 years ago
Alex Coles a4561354e4 Merge pull request #2481 from marutosi/finn/release/4.0/pry-byebug 10 years ago
Alex Coles 49a3228aa9 Merge pull request #2483 from marutosi/finn/release/4.0/nokogiri 10 years ago
Alex Coles 2c1eb57478 Merge pull request #2503 from marutosi/finn/release/4.0/dalli 10 years ago
Alex Coles 6b7b5eed60 Merge pull request #2513 from marutosi/finn/release/4.0/capybara-screenshot 10 years ago
Alex Coles 8d06adf682 Merge pull request #2499 from marutosi/finn/release/4.0/coderay 10 years ago
Alex Coles 3ca2a08389 Merge pull request #2504 from marutosi/finn/release/4.0/date_validator 10 years ago
Alex Coles 5e82e707f6 Merge pull request #2511 from marutosi/finn/release/4.0/oj 10 years ago
Alex Coles 95e0dd8583 Merge pull request #2507 from marutosi/finn/release/4.0/globalize 10 years ago
Alex Coles 0c3176b573 Merge pull request #2530 from marutosi/finn/release/4.0/cucumber-rails 10 years ago
Alex Coles 5655ae73d9 Merge pull request #2532 from marutosi/finn/release/4.0/shoulda-matchers/2.5 10 years ago
linki ea1a99c0db Merge pull request #2543 from netfighter/feature/18440-disallow-changing-values-of-hidden-admin-menus 10 years ago
Florian Kraft c3fe4e5503 Merge pull request #2540 from opf/feature/api_string_objects 10 years ago
Jan Sandbrink 0f3e00dc79 rename variable in spec 10 years ago
Alex Coles dcdf2ea061 Merge pull request #2527 from 0xF013/fix/18412-inplace-editor-icons-styling 10 years ago
Mihail Maxacov 11e6ae6d2c Merge pull request #2524 from opf/feature/18530-autoprefixer-rails 10 years ago
Solotchi Veaceslav bbcf34f020 Forbid access to blacklisted routes 10 years ago
Toshi MARUYAMA 9866bb791b update date_validator version 10 years ago
Toshi MARUYAMA ab9498ee97 pin coderay version 1.0.9 10 years ago
Jan Sandbrink 1074833a9f define string objects endpoint 10 years ago
Jan Sandbrink 2f71146115 remove typo from api spec 10 years ago
linki b0108b5ad5 Merge pull request #2548 from opf/fix/config_helpers_array 10 years ago
Markus Kahl c84b80bd8c make array always return an array 10 years ago
kgalli 1e45f73528 Merge pull request #2545 from opf/hotfix/sles_and_file_store 10 years ago
Markus Kahl 75dada5cf6 Merge branch 'fix/disabled_modules' into dev 10 years ago
Alex Coles 99963c632f Merge branch 'release/4.0' into dev 10 years ago
jonasheinrich 2068be2daf Merge pull request #2547 from opf/hotfix/update_ruby_version 10 years ago
kgalli 28531c779a Update ruby version to previous stable 2.1.5 10 years ago
Martin Linkhorst 6d39133aa5 change unless to if 10 years ago
Martin Linkhorst b8bbff4ad0 use the accessor method in order to work with arrays in env vars 10 years ago
Alex Coles 475299eafe Merge pull request #2544 from opf/fix/repository_tests_flickering 10 years ago
ulferts 4976ca0408 Merge pull request #2516 from opf/feature/null_links 10 years ago
Jan Sandbrink 497f084e5d fix flickering repository tests 10 years ago
Cyril Rohr e20ce10fc7 Add configuration for SLES-12 packaging on packager.io 10 years ago
Martin Linkhorst 39a12de3e2 explicitly default to :file_store in our configuration object 10 years ago
Martin Linkhorst c0ae700932 use rails' default path for :file_store 10 years ago
Cyril Rohr 074cdd2bcd Make file_store cache work 10 years ago
Jan Sandbrink 7b72bcdc5c rename parameter 10 years ago
Jan Sandbrink 2f012a09dd use show_if as guard clause 10 years ago
Jan Sandbrink 7c2a686657 make self_link even more awesome 10 years ago
ulferts 11fdb43186 Merge pull request #2541 from opf/feature/hidden_menu_items_env_override 10 years ago
Jens Ulferts 367d8e571f Merge branch 'release/4.0' into dev 10 years ago
ulferts 1f31057316 Merge pull request #2539 from 0xF013/hotfix/18493-timeline-not-loaded-with-group-other 10 years ago
Markus Kahl 2ab5a49b0d env override for hidden menu items; + docs 10 years ago
Markus Kahl 815493bf20 Merge pull request #2531 from netfighter/feature/18200_hide_and_disallow_admin_menu 10 years ago
Mihail Maxacov 153586d678 fix timeline not loaded when group other is activated in filters 10 years ago
netfighter 5e9bd9232c Fix configuration.yml.example 10 years ago
netfighter be232776c7 Allow configuration override using environment variables 10 years ago